[Transform] Improve error message on transform _update conflict (#9…

…6432) (#96474)
elastic · Jun 1, 2023 · 99cab0a · 99cab0a
1 parent 0d10286
commit 99cab0a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/docs/changelog/96432.yaml b/docs/changelog/96432.yaml
@@ -0,0 +1,5 @@
+pr: 96432
+summary: Improve error message on transform `_update` conflict
+area: Transform
+type: bug
+issues: []
diff --git a/...k/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/TransformMessages.java b/...k/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/TransformMessages.java
@@ -16,7 +16,8 @@ public class TransformMessages {
         "Timed out after [{0}] while waiting for transform [{1}] to stop";
     public static final String REST_STOP_TRANSFORM_WAIT_FOR_COMPLETION_INTERRUPT = "Interrupted while waiting for transform [{0}] to stop";
     public static final String REST_PUT_TRANSFORM_EXISTS = "Transform with id [{0}] already exists";
-    public static final String REST_UPDATE_TRANSFORM_CONFLICT = "Transform with id [{0}] got updated in the meantime. Please try again";
+    public static final String REST_UPDATE_TRANSFORM_CONFLICT =
+        "Cannot update transform id [{0}] due to a concurrent update conflict. Please retry.";
     public static final String REST_UNKNOWN_TRANSFORM = "Transform with id [{0}] could not be found";
     public static final String REST_STOP_TRANSFORM_WITHOUT_CONFIG =
         "Detected transforms with no config [{0}]. Use force to stop/delete them.";

diff --git a/...rc/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUpdateIT.java b/...rc/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUpdateIT.java
@@ -221,7 +221,7 @@ public void testConcurrentUpdates() throws Exception {
                 assertThat(re.getResponse().getStatusLine().getStatusCode(), is(equalTo(409)));
                 assertThat(
                     re.getMessage(),
-                    containsString("Transform with id [" + transformId + "] got updated in the meantime. Please try again")
+                    containsString("Cannot update transform id [" + transformId + "] due to a concurrent update conflict. Please retry.")
                 );
             }
         }