app: fix gRPC server stop. Add new parameter to run in servers in background

Author: imedina

opencga-app/src/main/java/org/opencb/opencga/app/cli/admin/AdminCliOptionsParser.java

@@ -401,8 +401,6 @@ public class DaemonCatalogCommandOptions extends CatalogDatabaseCommandOptions {
     /*
      * AUDIT SUB-COMMANDS
      */
-
-
     @Parameters(commandNames = {"query"}, commandDescription = "Query audit data from Catalog database")
     public class QueryAuditCommandOptions extends CatalogDatabaseCommandOptions {
 
@@ -424,7 +422,6 @@ public class StatsAuditCommandOptions extends CatalogDatabaseCommandOptions {
     /*
      * USER SUB-COMMANDS
      */
-
     @Parameters(commandNames = {"create"}, commandDescription = "Create a new user")
     public class CreateUserCommandOptions extends CatalogDatabaseCommandOptions {
 
@@ -616,6 +613,9 @@ public class RestServerCommandOptions extends CatalogDatabaseCommandOptions {
 
         @Parameter(names = {"--stop"}, description = "File with the new tool to be installed", arity = 0)
         public boolean stop;
+
+        @Parameter(names = {"--bg", "--background"}, description = "Run the server in background as a daemon", arity = 0)
+        public boolean background;
     }
 
     @Parameters(commandNames = {"grpc"}, commandDescription = "Print a summary list of all tools")
@@ -629,6 +629,9 @@ public class GrpcServerCommandOptions extends CatalogDatabaseCommandOptions {
 
         @Parameter(names = {"--stop"}, description = "File with the new tool to be installed", arity = 0)
         public boolean stop;
+
+        @Parameter(names = {"--bg", "--background"}, description = "Run the server in background as a daemon", arity = 0)
+        public boolean background;
     }
 
 

opencga-app/src/main/java/org/opencb/opencga/app/cli/admin/ServerCommandExecutor.java

@@ -17,7 +17,11 @@
 package org.opencb.opencga.app.cli.admin;
 
 
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import org.opencb.biodata.models.common.protobuf.service.ServiceTypesModel;
 import org.opencb.opencga.server.RestServer;
+import org.opencb.opencga.server.grpc.AdminServiceGrpc;
 import org.opencb.opencga.server.grpc.GrpcServer;
 
 import javax.ws.rs.client.Client;
@@ -59,31 +63,15 @@ public void execute() throws Exception {
 
     private void rest() throws Exception {
         if (serverCommandOptions.restServerCommandOptions.start) {
-//            StorageConfiguration storageConfiguration = configuration;
-//            if (StringUtils.isNotEmpty(restCommandOptions.restStartCommandOptions.commonOptions.conf)) {
-//                Path path = Paths.get(restCommandOptions.restStartCommandOptions.commonOptions.conf);
-//                if (Files.exists(path)) {
-//                    storageConfiguration = StorageConfiguration.load(Files.newInputStream(path));
-//                }
-//            }
-
-//            if (StringUtils.isNotEmpty(restCommandOptions.restStartCommandOptions.commonOptions.storageEngine)) {
-//                storageConfiguration.setDefaultStorageEngineId(restCommandOptions.restStartCommandOptions.commonOptions.storageEngine);
-//            }
-
-            // Server crated and started
             RestServer server = new RestServer(Paths.get(this.conf));
             server.start();
-            server.blockUntilShutdown();
+            if (!serverCommandOptions.restServerCommandOptions.background) {
+                server.blockUntilShutdown();
+            }
             logger.info("Shutting down OpenCGA Storage REST server");
         }
 
         if (serverCommandOptions.restServerCommandOptions.stop) {
-//            if (serverCommandOptions.restStopCommandOptions.port > 0) {
-//                port = restCommandOptions.restStopCommandOptions.port;
-//            }
-
-//            GeneralConfiguration openCGAGeneralConfiguration = getOpenCGAConfiguration();catalogConfiguration
             Client client = ClientBuilder.newClient();
             WebTarget target = client.target("http://localhost:" + configuration.getServer().getRest().getPort())
                     .path("opencga")
@@ -98,30 +86,21 @@ private void rest() throws Exception {
 
     private void grpc() throws Exception {
         if (serverCommandOptions.grpcServerCommandOptions.start) {
-
-            // Server crated and started
-//            FileInputStream fileInputStream = new FileInputStream(Paths.get(this.conf).resolve("storage-configuration.yml").toFile());
-//            StorageConfiguration load = StorageConfiguration.load(fileInputStream);
             GrpcServer server = new GrpcServer(Paths.get(this.conf));
             server.start();
-            server.blockUntilShutdown();
+            if (!serverCommandOptions.grpcServerCommandOptions.background) {
+                server.blockUntilShutdown();
+            }
             logger.info("Shutting down OpenCGA Storage GRPC server");
         }
 
         if (serverCommandOptions.grpcServerCommandOptions.stop) {
-//            if (serverCommandOptions.restStopCommandOptions.port > 0) {
-//                port = restCommandOptions.restStopCommandOptions.port;
-//            }
-//            GeneralConfiguration openCGAGeneralConfiguration = getOpenCGAConfiguration();
-            Client client = ClientBuilder.newClient();
-            WebTarget target = client.target("http://localhost" + configuration.getServer().getGrpc().getPort())
-                    .path("opencga")
-                    .path("webservices")
-                    .path("rest")
-                    .path("admin")
-                    .path("stop");
-            Response response = target.request().get();
-            logger.info(response.toString());
+            ManagedChannel channel = ManagedChannelBuilder.forTarget("localhost:" + configuration.getServer().getGrpc().getPort())
+                    .usePlaintext(true)
+                    .build();
+            AdminServiceGrpc.AdminServiceBlockingStub stub = AdminServiceGrpc.newBlockingStub(channel);
+            ServiceTypesModel.MapResponse stopResponse = stub.stop(null);
+            System.out.println(stopResponse.toString());
         }
     }