fix concurrent-safety of AlterMaterializedViewTest.testMVOnMVReload

Signed-off-by: Murphy <[email protected]>
murphyatwork · Dec 6, 2024 · 1a5e7b9 · 1a5e7b9
1 parent aa36526
commit 1a5e7b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java b/fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java
@@ -584,22 +584,22 @@ public void setDbId(long dbId) {
         this.dbId = dbId;
     }
 
-    public boolean isActive() {
+    public synchronized boolean isActive() {
         return active;
     }
 
     /**
      * active the materialized again & reload the state.
      */
-    public void setActive() {
+    public synchronized void setActive() {
         LOG.info("set {} to active", name);
         // reset mv rewrite cache when it is active again
         CachingMvPlanContextBuilder.getInstance().updateMvPlanContextCache(this, true);
         this.active = true;
         this.inactiveReason = null;
     }
 
-    public void setInactiveAndReason(String reason) {
+    public synchronized void setInactiveAndReason(String reason) {
         LOG.warn("set {} to inactive because of {}", name, reason);
         this.active = false;
         this.inactiveReason = reason;
@@ -611,14 +611,14 @@ public void setInactiveAndReason(String reason) {
     /**
      * Reset cached metadata when mv's meta has changed.
      */
-    public void resetMetadataCache() {
+    public synchronized void resetMetadataCache() {
         refBaseTablePartitionExprsOpt = Optional.empty();
         refBaseTablePartitionSlotsOpt = Optional.empty();
         refBaseTablePartitionColumnsOpt = Optional.empty();
         tableToBaseTableInfoCache.clear();
     }
 
-    public String getInactiveReason() {
+    public synchronized String getInactiveReason() {
         return inactiveReason;
     }
 

diff --git a/fe/fe-core/src/main/java/com/starrocks/common/util/Daemon.java b/fe/fe-core/src/main/java/com/starrocks/common/util/Daemon.java
@@ -62,12 +62,15 @@ public Runnable getRunnable() {
     public synchronized void start() {
         if (isRunning.compareAndSet(false, true)) {
             isStopped.set(false);
-            super.start();
+            if (getState() == State.NEW) {
+                super.start();
+            }
         }
     }
 
     public void setStop() {
         isStopped.set(true);
+        super.interrupt();
     }
 
     public boolean isRunning() {