fix(connection):adapter result has been overwritten. (#340)

* Fix the issue of the Adapter result being overwritten. * fix get sys tenant password
oceanbase · Sep 15, 2023 · a892684 · a892684
1 parent 3dd5b59
commit a892684
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...vice/src/main/java/com/oceanbase/odc/service/connection/ConnectionEnvironmentAdapter.java b/...vice/src/main/java/com/oceanbase/odc/service/connection/ConnectionEnvironmentAdapter.java
@@ -61,7 +61,7 @@ public <T extends CloudConnectionConfig> T adaptConfig(T connectionConfig) {
             }
             if (cloudMetadataClient.needsSysTenantUser()) {
                 // 需要使用 sys 租户账密
-                OBDatabaseUser sysTenantUser = cloudMetadataClient.getSysTenantUser(clusterName);
+                OBDatabaseUser sysTenantUser = cloudMetadataClient.getSysTenantUser(connectionConfig.getClusterName());
                 connectionConfig.setSysTenantUsername(sysTenantUser.getUserName());
                 connectionConfig.setSysTenantPassword(sysTenantUser.getPassword());
             }

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
@@ -569,9 +569,11 @@ public ConnectionConfig getForConnectionSkipPermissionCheck(@NotNull Long id) {
             connection.setQueryTimeoutSeconds(minQueryTimeoutSeconds);
             log.debug("queryTimeoutSeconds less than minQueryTimeoutSeconds, use {} instead", minQueryTimeoutSeconds);
         }
+        connectionEncryption.decryptPasswords(connection);
+        // Adapter should be called after decrypting passwords.
         environmentAdapter.adaptConfig(connection);
         connectionSSLAdaptor.adapt(connection);
-        return connectionEncryption.decryptPasswords(connection);
+        return connection;
     }
 
     @Transactional(rollbackFor = Exception.class)