clean-sit

Author: Caideyipi

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/client/ClientRunner.java

@@ -50,8 +50,6 @@ public class ClientRunner {
     Security.addProvider(new BouncyCastleProvider());
   }
 
-  private final CompletableFuture<OpcUaClient> future = new CompletableFuture<>();
-
   private final IoTDBOpcUaClient configurableUaClient;
   private final Path securityDir;
   private final String password;
@@ -104,29 +102,15 @@ public void run() {
     try {
       final OpcUaClient client = createClient();
 
-      future.whenCompleteAsync(
-          (c, ex) -> {
-            if (ex != null) {
-              logger.warn("Error running opc client: ", ex);
-            }
-
-            try {
-              client.disconnect().get();
-            } catch (final InterruptedException | ExecutionException e) {
-              Thread.currentThread().interrupt();
-              logger.warn("Error disconnecting: ", e);
-            }
-          });
-
       try {
         configurableUaClient.run(client);
-        future.get(
-            PipeConfig.getInstance().getPipeConnectorHandshakeTimeoutMs(), TimeUnit.MICROSECONDS);
       } catch (final Exception e) {
-        throw new PipeException("Error running opc client: " + e.getMessage());
+        throw new PipeException(
+            "Error running opc client: " + e.getClass().getSimpleName() + ": " + e.getMessage());
       }
     } catch (final Exception e) {
-      throw new PipeException("Error getting opc client: " + e.getMessage());
+      throw new PipeException(
+          "Error getting opc client: " + e.getClass().getSimpleName() + ": " + e.getMessage());
     }
   }
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/client/IoTDBKeyStoreLoaderClient.java

@@ -66,7 +66,7 @@ IoTDBKeyStoreLoaderClient load(final Path baseDir, final char[] password) throws
               .setOrganizationalUnit("dev")
               .setLocalityName("Beijing")
               .setStateName("China")
-              .setCountryCode("UN")
+              .setCountryCode("CN")
               .setApplicationUri("urn:apache:iotdb:opc-ua-client")
               .addDnsName("localhost")
               .addIpAddress("127.0.0.1");