[apache#768] [Follow Up] feat(cli): Cli method for blacklist update.

slfan1989 · Jun 25, 2023 · bdbe491 · bdbe491
1 parent 0e24225
commit bdbe491
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/cli/src/main/java/org/apache/uniffle/cli/UniffleAdminCLI.java b/cli/src/main/java/org/apache/uniffle/cli/UniffleAdminCLI.java
@@ -35,7 +35,7 @@ public class UniffleAdminCLI extends AbstractCustomCommandLine {
   private final Options allOptions;
   private final Option refreshCheckerCli;
   private final Option coordinatorHost;
-  private final Option coordPort;
+  private final Option coordinatorPort;
   private final Option ssl;
 
   private final Option help;
@@ -49,13 +49,13 @@ public UniffleAdminCLI(String shortPrefix, String longPrefix) {
         false, "Help for the Uniffle Admin CLI.");
     coordinatorHost = new Option(shortPrefix + "s", longPrefix + "coordinatorHost",
         true, "This is coordinator server host.");
-    coordPort = new Option(shortPrefix + "p", longPrefix + "port",
+    coordinatorPort = new Option(shortPrefix + "p", longPrefix + "port",
         true, "This is coordinator server port.");
-    ssl = new Option(null, longPrefix + "ssl", false, "use SSL");
+    ssl = new Option("l", longPrefix + "ssl", false, "use SSL");
 
     allOptions.addOption(refreshCheckerCli);
     allOptions.addOption(coordinatorHost);
-    allOptions.addOption(coordPort);
+    allOptions.addOption(coordinatorPort);
     allOptions.addOption(ssl);
     allOptions.addOption(help);
   }
@@ -68,14 +68,19 @@ public UniffleAdminCLI(String shortPrefix, String longPrefix, UniffleRestClient
   public int run(String[] args) throws UniffleCliArgsException {
     final CommandLine cmd = parseCommandLineOptions(args, true);
 
+    if (args != null && args.length < 1) {
+      printUsage();
+      return 1;
+    }
+
     if (cmd.hasOption(help.getOpt())) {
       printUsage();
       return 0;
     }
 
-    if (cmd.hasOption(coordinatorHost.getOpt()) && cmd.hasOption(coordPort.getOpt())) {
+    if (cmd.hasOption(coordinatorHost.getOpt()) && cmd.hasOption(coordinatorPort.getOpt())) {
       String host = cmd.getOptionValue(coordinatorHost.getOpt()).trim();
-      int port = Integer.parseInt(cmd.getOptionValue(coordPort.getOpt()).trim());
+      int port = Integer.parseInt(cmd.getOptionValue(coordinatorPort.getOpt()).trim());
       String hostUrl;
       if (cmd.hasOption(ssl.getOpt())) {
         hostUrl = String.format("https://%s:%d", host, port);
@@ -106,7 +111,8 @@ private String refreshAccessChecker() throws UniffleCliArgsException {
   public void addRunOptions(Options baseOptions) {
     baseOptions.addOption(refreshCheckerCli);
     baseOptions.addOption(coordinatorHost);
-    baseOptions.addOption(coordPort);
+    baseOptions.addOption(coordinatorPort);
+    baseOptions.addOption(ssl);
   }
 
   @Override

diff --git a/cli/src/main/java/org/apache/uniffle/client/RestClientImpl.java b/cli/src/main/java/org/apache/uniffle/client/RestClientImpl.java
@@ -92,7 +92,6 @@ private String doRequest(URI uri, String authHeader, RequestBuilder requestBuild
       response = httpclient.execute(httpRequest, responseHandler);
       LOG.debug("Response: {}", response);
     } catch (ConnectException | ConnectTimeoutException | NoHttpResponseException e) {
-      // net exception can be retried by connecting to other Kyuubi server
       throw new UniffleRestException("Api request failed for " + uri.toString(), e);
     } catch (UniffleRestException rethrow) {
       throw rethrow;