Merge branch 'develop' into hanxiao/dumbaware

Author: Flanker32

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

@@ -28,13 +28,16 @@
 import com.microsoft.azure.hdinsight.sdk.cluster.ClusterRawInfo;
 import com.microsoft.azure.hdinsight.sdk.common.AzureManagementHttpObservable;
 import com.microsoft.azure.hdinsight.sdk.common.errorresponse.ForbiddenHttpErrorStatus;
+import com.microsoft.azure.hdinsight.sdk.common.errorresponse.GatewayTimeoutErrorStatus;
 import com.microsoft.azure.hdinsight.sdk.common.errorresponse.HttpErrorStatus;
 import com.microsoft.azure.hdinsight.sdk.common.errorresponse.NotFoundHttpErrorStatus;
+import com.microsoft.azuretools.adauth.AuthException;
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
+import com.microsoft.azuretools.sdkmanage.AzureManager;
 import com.microsoft.azuretools.telemetry.AppInsightsClient;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.http.entity.StringEntity;
@@ -62,8 +65,18 @@ private AzureManagementHttpObservable getHttp() {
         return this.http;
     }
 
+    private AzureManager getAzureManager() throws IOException {
+        AzureManager azureManager = AuthMethodManager.getInstance().getAzureManager();
+
+        if (azureManager == null) {
+            throw new AuthException("Not signed in. Can't send out the request.");
+        }
+
+        return azureManager;
+    }
+
     public Observable<Map> getClusterCoreSiteRequest(@NotNull final String clusterId) throws IOException {
-        String managementURI = AuthMethodManager.getInstance().getAzureManager().getManagementURI();
+        String managementURI = getAzureManager().getManagementURI();
         String url = URI.create(managementURI)
                 .resolve(clusterId.replaceAll("/+$", "") + "/configurations/core-site").toString();
         return getHttp()
@@ -74,7 +87,7 @@ public Observable<Map> getClusterCoreSiteRequest(@NotNull final String clusterId
     private Observable<ClusterConfiguration> getClusterConfigurationRequest(
             @NotNull final String clusterId) {
         try {
-            String managementURI = AuthMethodManager.getInstance().getAzureManager().getManagementURI();
+            String managementURI = getAzureManager().getManagementURI();
             String url = URI.create(managementURI)
                     .resolve(clusterId.replaceAll("/+$", "") + "/configurations").toString();
             StringEntity entity = new StringEntity("", StandardCharsets.UTF_8);
@@ -124,10 +137,13 @@ public Observable<Boolean> isProbeGetConfigurationSucceed(final ClusterRawInfo c
                     } else {
                         if (err instanceof HttpErrorStatus) {
                             HDInsightNewApiUnavailableException ex = new HDInsightNewApiUnavailableException(err);
-                            if (!(err instanceof NotFoundHttpErrorStatus)) {
-                                log().error("Error getting cluster configurations with NEW HDInsight API. " + clusterId, ex);
+                            if (!(err instanceof NotFoundHttpErrorStatus
+                                    || err instanceof GatewayTimeoutErrorStatus)) {
+                                log().error(String.format(
+                                        "Error getting cluster configurations with NEW HDInsight API: %s, %s",
+                                        clusterId,
+                                        ((HttpErrorStatus) err).getErrorDetails()), ex);
                             }
-                            log().warn(((HttpErrorStatus) err).getErrorDetails());
 
                             final Map<String, String> properties = new HashMap<>();
                             properties.put("ClusterID", clusterId);

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/common/HttpObservable.java

@@ -301,6 +301,8 @@ public static HttpErrorStatus classifyHttpError(@NotNull CloseableHttpResponse h
             return new MethodNotAllowedHttpErrorStatus(message, headers, httpEntity);
         } else if (statusCode == 500) {
             return new InternalServerErrorHttpErrorStatus(message, headers, httpEntity);
+        } else if (statusCode == 504) {
+            return new GatewayTimeoutErrorStatus(message, headers, httpEntity);
         } else {
             return new UnclassifiedHttpErrorStatus(statusCode, message, headers, httpEntity);
         }

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/common/errorresponse/GatewayTimeoutErrorStatus.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Microsoft Corporation
+ *
+ * All rights reserved.
+ *
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.microsoft.azure.hdinsight.sdk.common.errorresponse;
+
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+
+import com.microsoft.azuretools.azurecommons.helpers.Nullable;
+
+public class GatewayTimeoutErrorStatus extends HttpErrorStatus {
+    public GatewayTimeoutErrorStatus(String message, @Nullable Header[] headers, @Nullable HttpEntity entity) {
+        super(504, message, headers, entity);
+    }
+}