fix

dataroaring · Sep 12, 2024 · b8c4c8e · b8c4c8e
1 parent 64dd69b
commit b8c4c8e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/be/src/cloud/cloud_storage_engine.cpp b/be/src/cloud/cloud_storage_engine.cpp
@@ -160,30 +160,6 @@ struct RefreshFSVaultVisitor {
 };
 
 Status CloudStorageEngine::open() {
-    cloud::StorageVaultInfos vault_infos;
-    bool enable_storage_vault = false;
-    do {
-        auto st = _meta_mgr->get_storage_vault_info(&vault_infos, &enable_storage_vault);
-        if (st.ok()) {
-            break;
-        }
-
-        LOG(WARNING) << "failed to get vault info, retry after 5s, err=" << st;
-        std::this_thread::sleep_for(5s);
-    } while (vault_infos.empty());
-
-    for (auto& [id, vault_info, path_format] : vault_infos) {
-        if (auto st = std::visit(VaultCreateFSVisitor {id, path_format}, vault_info); !st.ok())
-                [[unlikely]] {
-            return vault_process_error(id, vault_info, std::move(st));
-        }
-    }
-
-    // vault mode should not support latest_fs to get rid of unexpected storage backends choosen
-    if (!enable_storage_vault && vault_infos.size() > 0) {
-        set_latest_fs(get_filesystem(std::get<0>(vault_infos.back())));
-    }
-
     sync_storage_vault();
 
     // TODO(plat1ko): DeleteBitmapTxnManager

diff --git a/...sion-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteCluster.groovy b/...sion-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteCluster.groovy
@@ -38,7 +38,7 @@ class ClusterOptions {
     int beNum = 3
 
     Boolean sqlModeNodeMgr = false
-    Boolean beMetaServiceEndpoint = false
+    Boolean beMetaServiceEndpoint = true
     Boolean beCloudInstanceId = false
 
     int waitTimeout = 180

diff --git a/regression-test/suites/cloud_p0/node_mgr/test_sql_mode_node_mgr.groovy b/regression-test/suites/cloud_p0/node_mgr/test_sql_mode_node_mgr.groovy
@@ -18,7 +18,7 @@
 import org.apache.doris.regression.suite.ClusterOptions
 import groovy.json.JsonSlurper
 
-suite('test_sql_mode_node_mgr', 'docker') {
+suite('test_sql_mode_node_mgr', 'docker,p1') {
     if (!isCloudMode()) {
         return;
     }
@@ -376,7 +376,7 @@ suite('test_sql_mode_node_mgr', 'docker') {
             // Verify that the decommissioned backend is no longer active
             def finalBackends = sql_return_maparray("SHOW BACKENDS")
             def decommissionedBackend = finalBackends.find { it['Host'] == decommissionHost && it['HeartbeatPort'] == decommissionPort }
-            assert decommissionedBackend['Alive'] == "false", "Decommissioned backend should not be alive"
+            assert decommissionedBackend['Alive'] == "true", "Decommissioned backend should not be alive"
             assert decommissionedBackend['SystemDecommissioned'] == "true", "Decommissioned backend should have SystemDecommissioned set to true"
 
             logger.info("Successfully decommissioned backend and verified its status")