Review comments

snowflakedb · Jul 16, 2024 · c8c7a5a · c8c7a5a
1 parent 252f4f5
commit c8c7a5a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/net/snowflake/ingest/streaming/internal/StreamingIngestStage.java b/src/main/java/net/snowflake/ingest/streaming/internal/StreamingIngestStage.java
@@ -360,7 +360,7 @@ private JsonNode parseClientConfigureResponse(
           responseNode.has("deployment_id") ? responseNode.get("deployment_id").longValue() : null;
       if (actualDeploymentId != null && !actualDeploymentId.equals(expectedDeploymentId)) {
         throw new SFException(
-            ErrorCode.CLIENT_DEPLOYMENT_ID_MISMATCH, expectedDeploymentId, actualDeploymentId);
+            ErrorCode.CLIENT_DEPLOYMENT_ID_MISMATCH, expectedDeploymentId, actualDeploymentId, clientName);
       }
     }
     return responseNode;

diff --git a/src/main/java/net/snowflake/ingest/utils/ErrorCode.java b/src/main/java/net/snowflake/ingest/utils/ErrorCode.java
@@ -42,7 +42,6 @@ public enum ErrorCode {
   INVALID_CONFIG_PARAMETER("0034"),
   CRYPTO_PROVIDER_ERROR("0035"),
   DROP_CHANNEL_FAILURE("0036"),
-
   CLIENT_DEPLOYMENT_ID_MISMATCH("0037");
 
   public static final String errorMessageResource = "net.snowflake.ingest.ingest_error_messages";

diff --git a/src/main/resources/net/snowflake/ingest/ingest_error_messages.properties b/src/main/resources/net/snowflake/ingest/ingest_error_messages.properties
@@ -39,4 +39,4 @@
 0034=Invalid config parameter: {0}
 0035=Failed to load {0}. If you use FIPS, import BouncyCastleFipsProvider in the application: {1}
 0036=Failed to drop channel: {0}
-0037=Deployment ID mismatch, Client was created on: {0}, Got upload location for: {1}. Please restart client.
+0037=Deployment ID mismatch, Client was created on: {0}, Got upload location for: {1}. Please restart client: {2}.