You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tl...@apache.org on 2020/06/30 10:36:08 UTC

[ignite] branch master updated: IGNITE-13194 Fix test IgnitePdsBinaryMetadataOnClusterRestartTest#testNodeWithIncompatibleMetadataIsProhibitedToJoinTheCluste: change expected error message (#7969)

This is an automated email from the ASF dual-hosted git repository.

tledkov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e385f8  IGNITE-13194 Fix test IgnitePdsBinaryMetadataOnClusterRestartTest#testNodeWithIncompatibleMetadataIsProhibitedToJoinTheCluste: change expected error message (#7969)
0e385f8 is described below

commit 0e385f8883a98c0a9a9e03b715c10363198c8999
Author: Vladsz83 <vl...@gmail.com>
AuthorDate: Tue Jun 30 13:35:49 2020 +0300

    IGNITE-13194 Fix test IgnitePdsBinaryMetadataOnClusterRestartTest#testNodeWithIncompatibleMetadataIsProhibitedToJoinTheCluste: change expected error message (#7969)
---
 .../persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index 1ed8607..3c289eff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -334,11 +334,14 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
 
         String expectedMsg = String.format(
             "Type '%s' with typeId %d has a different/incorrect type for field '%s'. Expected 'int' but 'long' was " +
-                "provided. Field type's modification is unsupported, clean {root_path}/marshaller and " +
-                "{root_path}/db/binary_meta directories if the type change is required.",
+                "provided. The type of an existing field can not be changed. Use a different field name or follow " +
+                "this procedure to reuse the current name:\n" +
+                "- Delete data records that use the old field type;\n" +
+                "- Remove metadata by the command: 'control.sh --meta remove --typeId %d'.",
             DYNAMIC_TYPE_NAME,
             createdTypeId,
-            decimalFieldName);
+            decimalFieldName,
+            createdTypeId);
 
         Throwable thrown = GridTestUtils.assertThrows(
             log,