patch ODC 413bp10 bug fix:adaption for OBInstanceType

oceanbase · Apr 1, 2024 · 34b954d · 34b954d
1 parent 881e650
commit 34b954d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/connection/ConnectionService.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/connection/ConnectionService.java
@@ -300,6 +300,8 @@ public ConnectionConfig innerCreate(@NotNull @Valid ConnectionConfig connection,
 
             if (connection.getPasswordSaved()) {
                 PreConditions.notNull(connection.getPassword(), "connection.password");
+            } else {
+                connection.setPassword(null);
             }
             connectionEncryption.encryptPasswords(connection);
 

diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/connection/ConnectionTesting.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/connection/ConnectionTesting.java
@@ -232,7 +232,6 @@ private ConnectionConfig reqToConnectionConfig(TestConnectionReq req) {
 
         OBTenantEndpoint endpoint = req.getEndpoint();
         if (Objects.nonNull(endpoint) && OceanBaseAccessMode.IC_PROXY == endpoint.getAccessMode()) {
-            config.setClusterName(null);
             config.setEndpoint(endpoint);
         }
         if (StringUtils.isNotBlank(req.getOBTenantName())) {

diff --git a/...dc-service/src/main/java/com/oceanbase/odc/service/connection/model/OBInstanceStatus.java b/...dc-service/src/main/java/com/oceanbase/odc/service/connection/model/OBInstanceStatus.java
@@ -36,7 +36,13 @@ public enum OBInstanceStatus {
 
     ABNORMAL("ABNORMAL"),
 
-    OFFLINE("OFFLINE");
+    OFFLINE("OFFLINE"),
+
+    PENDING_STOP("PENDING_STOP"),
+
+    STOPPED("STOPPED"),
+
+    PENDING_START("PENDING_START");
 
     private String name;
 

diff --git a/.../odc-service/src/main/java/com/oceanbase/odc/service/connection/model/OBInstanceType.java b/.../odc-service/src/main/java/com/oceanbase/odc/service/connection/model/OBInstanceType.java
@@ -32,7 +32,8 @@ public enum OBInstanceType implements Translatable {
     MYSQL_TENANT("mtenant"),
     ORACLE_TENANT("otenant"),
     MYSQL_SERVERLESS("mtenant_serverless"),
-    ORACLE_SERVERLESS("otenant_serverless");
+    ORACLE_SERVERLESS("otenant_serverless"),
+    DEDICATED("DEDICATED");
 
     @Getter
     private String value;