YARN-9281. Add express upgrade button to Appcatalog UI. Contributed by Eric Yang

Author: billierinaldi

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml

@@ -487,5 +487,4 @@
         </build>
       </profile>
     </profiles>
-
 </project>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java

@@ -291,13 +291,12 @@ public void deployApp(String id, Service service) throws SolrServerException,
       docs.add(request);
     }
 
-    // Commit Solr changes.
-    UpdateResponse detailsResponse = solr.add(docs);
-    if (detailsResponse.getStatus() != 0) {
+    try {
+      commitSolrChanges(solr, docs);
+    } catch (IOException e) {
       throw new IOException("Unable to register docker instance "
-          + "with application entry.");
+          + "with application entry.", e);
     }
-    solr.commit();
   }
 
   private SolrInputDocument incrementDownload(SolrDocument doc,
@@ -350,16 +349,10 @@ public void register(Application app) throws IOException {
       buffer.setField("yarnfile_s", mapper.writeValueAsString(yarnApp));
 
       docs.add(buffer);
-      // Commit Solr changes.
-      UpdateResponse detailsResponse = solr.add(docs);
-      if (detailsResponse.getStatus() != 0) {
-        throw new IOException("Unable to register application " +
-            "in Application Store.");
-      }
-      solr.commit();
+      commitSolrChanges(solr, docs);
     } catch (SolrServerException | IOException e) {
       throw new IOException("Unable to register application " +
-          "in Application Store. "+ e.getMessage());
+          "in Application Store. ", e);
     }
   }
 
@@ -389,16 +382,64 @@ protected void register(AppStoreEntry app) throws IOException {
       buffer.setField("yarnfile_s", mapper.writeValueAsString(yarnApp));
 
       docs.add(buffer);
-      // Commit Solr changes.
-      UpdateResponse detailsResponse = solr.add(docs);
-      if (detailsResponse.getStatus() != 0) {
-        throw new IOException("Unable to register application " +
-            "in Application Store.");
-      }
-      solr.commit();
+      commitSolrChanges(solr, docs);
     } catch (SolrServerException | IOException e) {
       throw new IOException("Unable to register application " +
-          "in Application Store. "+ e.getMessage());
+          "in Application Store. ", e);
     }
   }
+
+  public void upgradeApp(Service service) throws IOException,
+      SolrServerException {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    Collection<SolrInputDocument> docs = new HashSet<SolrInputDocument>();
+    SolrClient solr = getSolrClient();
+    if (service!=null) {
+      String name = service.getName();
+      String app = "";
+      SolrQuery query = new SolrQuery();
+      query.setQuery("id:" + name);
+      query.setFilterQueries("type_s:AppEntry");
+      query.setRows(1);
+
+      QueryResponse response;
+      try {
+        response = solr.query(query);
+        Iterator<SolrDocument> appList = response.getResults().listIterator();
+        while (appList.hasNext()) {
+          SolrDocument d = appList.next();
+          app = d.get("app_s").toString();
+        }
+      } catch (SolrServerException | IOException e) {
+        LOG.error("Error in finding deployed application: " + name, e);
+      }
+      // Register deployed application instance with AppList
+      SolrInputDocument request = new SolrInputDocument();
+      request.addField("type_s", "AppEntry");
+      request.addField("id", name);
+      request.addField("name_s", name);
+      request.addField("app_s", app);
+      request.addField("yarnfile_s", mapper.writeValueAsString(service));
+      docs.add(request);
+    }
+    try {
+      commitSolrChanges(solr, docs);
+    } catch (IOException e) {
+      throw new IOException("Unable to register docker instance "
+          + "with application entry.", e);
+    }
+  }
+
+  private void commitSolrChanges(SolrClient solr,
+      Collection<SolrInputDocument> docs)
+          throws IOException, SolrServerException {
+    // Commit Solr changes.
+    UpdateResponse detailsResponse = solr.add(docs);
+    if (detailsResponse.getStatus() != 0) {
+      throw new IOException("Failed to commit document in solr, status code: "
+          + detailsResponse.getStatus());
+    }
+    solr.commit();
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java

@@ -27,6 +27,7 @@
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
 import org.apache.hadoop.yarn.service.api.records.Service;
+import org.apache.hadoop.yarn.service.api.records.ServiceState;
 import org.apache.hadoop.yarn.service.api.records.KerberosPrincipal;
 import org.apache.hadoop.yarn.service.client.ApiServiceClient;
 
@@ -171,4 +172,25 @@ public void getStatus(AppEntry entry) {
       LOG.error("Error in fetching application status: ", e);
     }
   }
+
+  public void upgradeApp(Service app) throws JsonProcessingException {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    String appInstanceId = app.getName();
+    app.setState(ServiceState.EXPRESS_UPGRADING);
+    String yarnFile = mapper.writeValueAsString(app);
+    ClientResponse response;
+    try {
+      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+          .put(ClientResponse.class, yarnFile);
+      if (response.getStatus() >= 299) {
+        String message = response.getEntity(String.class);
+        throw new RuntimeException("Failed : HTTP error code : "
+            + response.getStatus() + " error: " + message);
+      }
+    } catch (UniformInterfaceException | ClientHandlerException
+        | IOException e) {
+      LOG.error("Error in stopping application: ", e);
+    }
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java

@@ -18,8 +18,12 @@
 
 package org.apache.hadoop.yarn.appcatalog.controller;
 
+import java.io.IOException;
+
+import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -32,6 +36,7 @@
 import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
 import org.apache.hadoop.yarn.service.api.records.Service;
 import org.apache.hadoop.yarn.service.api.records.ServiceState;
+import org.apache.solr.client.solrj.SolrServerException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
@@ -262,4 +267,33 @@ public Response restartApp(@PathParam("id") String id) {
     }
     return Response.ok().build();
   }
+
+  /**
+   * Upgrade an application.
+   *
+   * @apiGroup AppDetailController
+   * @apiName upgradeApp
+   * @api {put} /app_details/upgrade/{id} Upgrade one instance of application.
+   * @apiParam {String} id Application Name to upgrade.
+   * @apiSuccess {String} text
+   * @apiError BadRequest Requested application does not upgrade.
+   * @return Web response code
+   */
+  @Path("upgrade/{id}")
+  @PUT
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response upgradeApp(@PathParam("id") String id, Service app) {
+    try {
+      AppCatalogSolrClient sc = new AppCatalogSolrClient();
+      sc.upgradeApp(app);
+      YarnServiceClient yc = new YarnServiceClient();
+      yc.upgradeApp(app);
+    } catch (IOException | SolrServerException e) {
+      return Response.status(Status.BAD_REQUEST).entity(e.toString()).build();
+    }
+    String output = "{\"status\":\"Application upgrade requested.\",\"id\":\"" +
+        app.getName() + "\"}";
+    return Response.status(Status.ACCEPTED).entity(output).build();
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js

@@ -53,6 +53,9 @@ app.config(['$routeProvider',
     }).when('/deploy/:id', {
       templateUrl: 'partials/deploy.html',
       controller: 'DeployAppController'
+    }).when('/upgrade/:id', {
+      templateUrl: 'partials/upgrade.html',
+      controller: 'UpgradeAppController'
     }).otherwise({
       redirectTo: '/'
     });

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js

@@ -127,6 +127,10 @@ controllers.controller("AppDetailsController", [ '$scope', '$interval', '$rootSc
         }, errorCallback);
       }
 
+      $scope.upgradeApp = function(id) {
+        window.location = '/#!/upgrade/' + id;
+      }
+
       $scope.canDeployApp = function() {
         return true;
       };
@@ -306,6 +310,56 @@ controllers.controller("DeployAppController", [ '$scope', '$rootScope', '$http',
 
 }]);
 
+controllers.controller("UpgradeAppController", [ '$scope', '$rootScope', '$http',
+    '$routeParams', function($scope, $rootScope, $http, $routeParams) {
+    $scope.message = null;
+    $scope.error = null;
+    $scope.appName = $routeParams.id;
+    $scope.refreshAppDetails = function() {
+      $http({
+        method : 'GET',
+        url : '/v1/app_details/status/' + $scope.appName
+      }).then(successCallback, errorCallback);
+    }
+
+    $scope.upgradeApp = function(app) {
+      $rootScope.$emit("showLoadScreen", {});
+      $http({
+        method : 'PUT',
+        url : '/v1/app_details/upgrade/' + $scope.appName,
+        data : JSON.stringify($scope.details)
+      }).then(function(data, status, headers, config) {
+        $rootScope.$emit("RefreshAppList", {});
+        window.location = '/#!/app/' + data.data.id;
+      }, function(data, status, headers, config) {
+        $rootScope.$emit("hideLoadScreen", {});
+        $scope.error = data.data;
+        $('#error-message').html(data.data);
+        $('#myModal').modal('show');
+        console.log('error', data, status);
+      });
+    }
+
+    function successCallback(response) {
+      if (response.data.yarnfile.components.length!=0) {
+        $scope.details = response.data.yarnfile;
+      } else {
+        // When application is in accepted or failed state, it does not
+        // have components detail, hence we update states only.
+        $scope.details.state = response.data.yarnfile.state;
+      }
+    }
+
+    function errorCallback(response) {
+      $rootScope.$emit("hideLoadScreen", {});
+      $scope.error = "Error in getting application detail.";
+      $('#error-message').html($scope.error);
+      $('#myModal').modal('show');
+    }
+
+    $scope.refreshAppDetails();
+}]);
+
 controllers.controller("LoadScreenController", [ '$scope', '$rootScope', '$http', function($scope, $rootScope, $http) {
   $scope.loadScreen = "hide";
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css

@@ -184,6 +184,11 @@
   background-color: #FFF;
   box-shadow: 0 0 2px 0 #1391c1;
 }
+.btn-secondary:visited {
+  color: #429929;
+  background-color: #FFF;
+  box-shadow: 0 0 2px 0 #1391c1;
+}
 .btn-secondary[disabled],
 .btn-secondary:focus[disabled],
 .btn-secondary.disabled,

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html

@@ -14,8 +14,9 @@
 <div class="container content">
   <div class="row">
     <div class="col-xs-12 col-md-12 col-lg-12">
+      <a ng-click="restartApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-play"></span> Start</a>
       <a ng-click="stopApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-stop"></span> Stop</a>
-      <a ng-click="restartApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-refresh"></span> Start</a>
+      <a ng-click="upgradeApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-circle-arrow-up"></span> Upgrade</a>
       <div style="display:inline-block;" ng-repeat="(key, value) in details.yarnfile.quicklinks">
         <a href="{{value}}" class="btn btn-secondary" ng-hide="checkServiceLink()"><span class="glyphicon glyphicon-new-window"></span> {{key}}</a>
       </div>