Merge pull request #6958 from v-jiezhang3/endgame-202209

Endgame 202209

Author: wangmingliang-ms

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/HDInsightNewAPI/ClusterOperationNewAPIImpl.java

@@ -58,9 +58,8 @@ public Observable<Map> getClusterCoreSiteRequest(@NotNull final String clusterId
                 .get(url, null, null, Map.class);
     }
 
-    private Observable<ClusterConfiguration> getClusterConfigurationFromManagementEndpoint(
-            @NotNull final String clusterId) {
-        String managementURI = Azure.az(AzureCloud.class).getOrDefault().getManagementEndpoint();
+    private Observable<ClusterConfiguration> getClusterConfigurationRequest(
+            @NotNull final String clusterId, String managementURI) {
         String url = URI.create(managementURI)
                 .resolve(clusterId.replaceAll("/+$", "") + "/configurations").toString();
         StringEntity entity = new StringEntity("", StandardCharsets.UTF_8);
@@ -70,22 +69,11 @@ private Observable<ClusterConfiguration> getClusterConfigurationFromManagementEn
                 .post(url, entity, null, null, ClusterConfiguration.class);
     }
 
-    private Observable<ClusterConfiguration> getClusterConfigurationFromResourceManagerEndpoint(
-            @NotNull final String clusterId) {
-        String managementURI = Azure.az(AzureCloud.class).getOrDefault().getResourceManagerEndpoint();
-        String url = URI.create(managementURI)
-                .resolve(clusterId.replaceAll("/+$", "") + "/configurations").toString();
-        StringEntity entity = new StringEntity("", StandardCharsets.UTF_8);
-        entity.setContentType("application/json");
-        return getHttp()
-                .withUuidUserAgent()
-                .post(url, entity, null, null, ClusterConfiguration.class);
-    }
 
     public Observable<Boolean> isProbeGetConfigurationSucceed(final ClusterRawInfo clusterRawInfo) {
         String clusterId = clusterRawInfo.getId();
-
-        return getClusterConfigurationFromResourceManagerEndpoint(clusterId)
+        String managementURI = Azure.az(AzureCloud.class).getOrDefault().getResourceManagerEndpoint();
+        return getClusterConfigurationRequest(clusterId,managementURI)
                 .map(clusterConfiguration -> {
                     if (isClusterConfigurationValid(clusterRawInfo, clusterConfiguration)) {
                         setRoleType(HDInsightUserRoleType.OWNER);
@@ -176,13 +164,14 @@ public com.microsoft.azure.hdinsight.sdk.cluster.ClusterConfiguration getCluster
         try {
             switch (roleType) {
                 case OWNER:
-                    return getClusterConfigurationFromManagementEndpoint(clusterId)
+                    String managementURI = Azure.az(AzureCloud.class).getOrDefault().getManagementEndpoint();
+                    return getClusterConfigurationRequest(clusterId,managementURI)
                             // As you can see, the response class is
                             // com.microsoft.azure.hdinsight.sdk.cluster.HDInsightNewAPI.ClusterConfiguration.
                             // However, if we want to override method getClusterConfiguration, the method return type should be
                             // com.microsoft.azure.hdinsight.sdk.cluster.ClusterConfiguration.
                             // Therefore, we need to convert the new API response to old API.
-                            .map(ClusterOperationNewAPIImpl::convertConfigurationToOldAPI)
+                                  .map(ClusterOperationNewAPIImpl::convertConfigurationToOldAPI)
                             .toBlocking()
                             .singleOrDefault(null);
                 case READER:

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/spark/jobs/ActionHttpHandler.java

@@ -24,17 +24,17 @@ public void handle(HttpExchange httpExchange) throws IOException {
 
         final String path = requestDetail.getRequestPath();
         final String clusterConnectString = requestDetail.getCluster().getConnectionUrl();
-        if (path.contains("yarnui")) {
-            JobUtils.openYarnUIHistory(clusterConnectString, requestDetail.getAppId());
-        } else if (path.contains("sparkui")) {
-            try {
+        try {
+            if (path.contains("yarnui")) {
+                JobUtils.openYarnUIHistory(clusterConnectString, requestDetail.getAppId());
+            } else if (path.contains("sparkui")) {
                 Application application = JobViewCacheManager.getSingleSparkApplication(new ApplicationKey(requestDetail.getCluster(), requestDetail.getAppId()));
                 JobUtils.openSparkUIHistory(clusterConnectString, requestDetail.getAppId(), application.getLastAttemptId());
-                JobUtils.setResponse(httpExchange, "open browser successfully");
-            } catch (ExecutionException e) {
-                JobUtils.setResponse(httpExchange, "open browser error", 500);
-                DefaultLoader.getUIHelper().showError(e.getMessage(), "open browser error");
             }
+            JobUtils.setResponse(httpExchange, "open browser successfully");
+        } catch (ExecutionException e) {
+            JobUtils.setResponse(httpExchange, "open browser error", 500);
+            DefaultLoader.getUIHelper().showError(e.getMessage(), "open browser error");
         }
     }
 }