You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by mp...@apache.org on 2025/05/21 11:26:06 UTC

(ignite-3) branch main updated: IGNITE-25350 Add quorum size parameter to the Catalog API (#5810)

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

mpochatkin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 62202509481 IGNITE-25350 Add quorum size parameter to the Catalog API (#5810)
62202509481 is described below

commit 6220250948196d99fa14b09e0ab4396b391727b1
Author: Vadim Pakhnushev <86...@users.noreply.github.com>
AuthorDate: Wed May 21 14:26:01 2025 +0300

    IGNITE-25350 Add quorum size parameter to the Catalog API (#5810)
---
 .../apache/ignite/catalog/annotations/Zone.java    |  7 +++++
 .../ignite/catalog/definitions/ZoneDefinition.java | 31 ++++++++++++++++++++++
 .../ignite/internal/catalog/ItCatalogDslTest.java  |  4 ++-
 .../internal/matcher/ZoneDefinitionMatcher.java    | 14 ++++++++++
 .../catalog/sql/CreateFromAnnotationsImpl.java     |  3 +++
 .../catalog/sql/CreateFromDefinitionImpl.java      |  3 +++
 .../internal/catalog/sql/CreateZoneImpl.java       |  7 +++++
 .../internal/catalog/sql/IgniteCatalogSqlImpl.java | 15 ++++++-----
 .../apache/ignite/internal/catalog/sql/Option.java |  4 +++
 .../catalog/sql/CreateFromAnnotationsTest.java     | 23 +++++++++-------
 .../catalog/sql/CreateFromDefinitionTest.java      |  5 ++--
 .../catalog/sql/InvalidDefinitionTest.java         |  1 +
 12 files changed, 98 insertions(+), 19 deletions(-)

diff --git a/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java b/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java
index db2ad910ba5..9e09b63881b 100644
--- a/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java
+++ b/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java
@@ -56,6 +56,13 @@ public @interface Zone {
      */
     int replicas() default -1;
 
+    /**
+     * Quorum size.
+     *
+     * @return Quorum size.
+     */
+    int quorumSize() default -1;
+
     /**
      * Distribution algorithm.
      *
diff --git a/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java b/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java
index 5259f1f539c..f4ddac64815 100644
--- a/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java
+++ b/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java
@@ -31,6 +31,8 @@ public class ZoneDefinition {
 
     private final Integer replicas;
 
+    private final Integer quorumSize;
+
     private final String distributionAlgorithm;
 
     private final Integer dataNodesAutoAdjust;
@@ -50,6 +52,7 @@ public class ZoneDefinition {
             boolean ifNotExists,
             Integer partitions,
             Integer replicas,
+            Integer quorumSize,
             String distributionAlgorithm,
             Integer dataNodesAutoAdjust,
             Integer dataNodesAutoAdjustScaleUp,
@@ -62,6 +65,7 @@ public class ZoneDefinition {
         this.ifNotExists = ifNotExists;
         this.partitions = partitions;
         this.replicas = replicas;
+        this.quorumSize = quorumSize;
         this.distributionAlgorithm = distributionAlgorithm;
         this.dataNodesAutoAdjust = dataNodesAutoAdjust;
         this.dataNodesAutoAdjustScaleUp = dataNodesAutoAdjustScaleUp;
@@ -117,6 +121,15 @@ public class ZoneDefinition {
         return replicas;
     }
 
+    /**
+     * Returns quorum size.
+     *
+     * @return Quorum size.
+     */
+    public Integer quorumSize() {
+        return quorumSize;
+    }
+
     /**
      * Returns distribution algorithm.
      *
@@ -196,6 +209,7 @@ public class ZoneDefinition {
                 + ", ifNotExists=" + ifNotExists
                 + ", partitions=" + partitions
                 + ", replicas=" + replicas
+                + ", quorumSize=" + quorumSize
                 + ", distributionAlgorithm='" + distributionAlgorithm + '\''
                 + ", dataNodesAutoAdjust=" + dataNodesAutoAdjust
                 + ", dataNodesAutoAdjustScaleUp=" + dataNodesAutoAdjustScaleUp
@@ -218,6 +232,8 @@ public class ZoneDefinition {
 
         private Integer replicas;
 
+        private Integer quorumSize;
+
         private String distributionAlgorithm;
 
         private Integer dataNodesAutoAdjust;
@@ -239,6 +255,7 @@ public class ZoneDefinition {
             ifNotExists = definition.ifNotExists;
             partitions = definition.partitions;
             replicas = definition.replicas;
+            quorumSize = definition.quorumSize;
             distributionAlgorithm = definition.distributionAlgorithm;
             dataNodesAutoAdjust = definition.dataNodesAutoAdjust;
             dataNodesAutoAdjustScaleUp = definition.dataNodesAutoAdjustScaleUp;
@@ -300,6 +317,19 @@ public class ZoneDefinition {
             return this;
         }
 
+        /**
+         * Sets quorum size.
+         *
+         * @param quorumSize Quorum size.
+         * @return This builder instance.
+         */
+        public Builder quorumSize(Integer quorumSize) {
+            Objects.requireNonNull(quorumSize, "Quorum size must not be null.");
+
+            this.quorumSize = quorumSize;
+            return this;
+        }
+
         /**
          * Sets the distribution algorithm.
          *
@@ -411,6 +441,7 @@ public class ZoneDefinition {
                     ifNotExists,
                     partitions,
                     replicas,
+                    quorumSize,
                     distributionAlgorithm,
                     dataNodesAutoAdjust,
                     dataNodesAutoAdjustScaleUp,
diff --git a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java
index 4c57b7f7034..56043a1a278 100644
--- a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java
+++ b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java
@@ -380,7 +380,8 @@ class ItCatalogDslTest extends ClusterPerClassIntegrationTest {
                 .builder(ZONE_NAME)
                 .storageProfiles(DEFAULT_AIPERSIST_PROFILE_NAME)
                 .partitions(3)
-                .replicas(3)
+                .replicas(5)
+                .quorumSize(2)
                 .dataNodesAutoAdjustScaleDown(0)
                 .dataNodesAutoAdjustScaleUp(1)
                 .filter("$..*")
@@ -397,6 +398,7 @@ class ItCatalogDslTest extends ClusterPerClassIntegrationTest {
                         .withZoneName(zoneDefinition.zoneName())
                         .withPartitions(zoneDefinition.partitions())
                         .withReplicas(zoneDefinition.replicas())
+                        .withQuorumSize(zoneDefinition.quorumSize())
                         .withDataNodesAutoAdjustScaleDown(zoneDefinition.dataNodesAutoAdjustScaleDown())
                         .withDataNodesAutoAdjustScaleUp(zoneDefinition.dataNodesAutoAdjustScaleUp())
                         .withFilter(zoneDefinition.filter())
diff --git a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java
index eae4488314b..ce62ce8d639 100644
--- a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java
+++ b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java
@@ -37,6 +37,8 @@ public class ZoneDefinitionMatcher extends TypeSafeMatcher<ZoneDefinition> {
 
     private Matcher<Integer> replicasMatcher = AnythingMatcher.anything();
 
+    private Matcher<Integer> quorumSizeMatcher = AnythingMatcher.anything();
+
     private Matcher<String> distributionAlgorithmMatcher = AnythingMatcher.anything();
 
     private Matcher<Integer> dataNodesAutoAdjustMatcher = AnythingMatcher.anything();
@@ -87,6 +89,15 @@ public class ZoneDefinitionMatcher extends TypeSafeMatcher<ZoneDefinition> {
         return withReplicasMatcher(equalTo(replicas));
     }
 
+    public ZoneDefinitionMatcher withQuorumSize(Matcher<Integer> quorumSizeMatcher) {
+        this.quorumSizeMatcher = quorumSizeMatcher;
+        return this;
+    }
+
+    public ZoneDefinitionMatcher withQuorumSize(int quorumSize) {
+        return withQuorumSize(equalTo(quorumSize));
+    }
+
     public ZoneDefinitionMatcher withDistributionAlgorithmMatcher(Matcher<String> withDistributionAlgorithmMatcher) {
         this.distributionAlgorithmMatcher = withDistributionAlgorithmMatcher;
         return this;
@@ -162,6 +173,7 @@ public class ZoneDefinitionMatcher extends TypeSafeMatcher<ZoneDefinition> {
                 && ifNotExistsMatcher.matches(zoneDefinition.ifNotExists())
                 && partitionsMatcher.matches(zoneDefinition.partitions())
                 && replicasMatcher.matches(zoneDefinition.replicas())
+                && quorumSizeMatcher.matches(zoneDefinition.quorumSize())
                 && distributionAlgorithmMatcher.matches(zoneDefinition.distributionAlgorithm())
                 && dataNodesAutoAdjustMatcher.matches(zoneDefinition.dataNodesAutoAdjust())
                 && zoneNameMatcher.matches(zoneDefinition.zoneName())
@@ -183,6 +195,8 @@ public class ZoneDefinitionMatcher extends TypeSafeMatcher<ZoneDefinition> {
                 .appendText(System.lineSeparator())
                 .appendText("replicas ").appendDescriptionOf(replicasMatcher)
                 .appendText(System.lineSeparator())
+                .appendText("quorum size ").appendDescriptionOf(quorumSizeMatcher)
+                .appendText(System.lineSeparator())
                 .appendText("affinity ").appendDescriptionOf(distributionAlgorithmMatcher)
                 .appendText(System.lineSeparator())
                 .appendText("data nodes auto adjust ").appendDescriptionOf(dataNodesAutoAdjustMatcher)
diff --git a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java
index 744e3fafae1..17877abac8f 100644
--- a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java
+++ b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java
@@ -125,6 +125,9 @@ class CreateFromAnnotationsImpl extends AbstractCatalogQuery<TableZoneId> {
             if (zone.replicas() > 0) {
                 createZone.replicas(zone.replicas());
             }
+            if (zone.quorumSize() > 0) {
+                createZone.quorumSize(zone.quorumSize());
+            }
 
             if (!zone.distributionAlgorithm().isEmpty()) {
                 createZone.distributionAlgorithm(zone.distributionAlgorithm());
diff --git a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java
index 381d806265d..adc4983ce3b 100644
--- a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java
+++ b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java
@@ -66,6 +66,9 @@ class CreateFromDefinitionImpl extends AbstractCatalogQuery<TableZoneId> {
         if (isGreaterThanZero(def.replicas())) {
             createZone.replicas(def.replicas());
         }
+        if (isGreaterThanZero(def.quorumSize())) {
+            createZone.quorumSize(def.quorumSize());
+        }
 
         if (!StringUtils.nullOrBlank(def.distributionAlgorithm())) {
             createZone.distributionAlgorithm(def.distributionAlgorithm());
diff --git a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java
index ff8a3e7f333..88f8176dbb2 100644
--- a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java
+++ b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java
@@ -64,6 +64,13 @@ class CreateZoneImpl extends AbstractCatalogQuery<Name> {
         return this;
     }
 
+    CreateZoneImpl quorumSize(Integer n) {
+        Objects.requireNonNull(n, "Quorum size must not be null.");
+
+        withOptions.add(Option.quorumSize(n));
+        return this;
+    }
+
     CreateZoneImpl partitions(Integer n) {
         Objects.requireNonNull(n, "Partitions must not be null.");
 
diff --git a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/IgniteCatalogSqlImpl.java b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/IgniteCatalogSqlImpl.java
index bafb9d649c8..d8fb4b6cde5 100644
--- a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/IgniteCatalogSqlImpl.java
+++ b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/IgniteCatalogSqlImpl.java
@@ -115,12 +115,13 @@ public class IgniteCatalogSqlImpl implements IgniteCatalog {
     @Override
     public CompletableFuture<ZoneDefinition> zoneDefinitionAsync(String zoneName) {
         List<String> zoneViewColumns = List.of(
-                "PARTITIONS",
-                "REPLICAS",
+                "ZONE_PARTITIONS",
+                "ZONE_REPLICAS",
+                "ZONE_QUORUM_SIZE",
                 "DATA_NODES_AUTO_ADJUST_SCALE_UP",
                 "DATA_NODES_AUTO_ADJUST_SCALE_DOWN",
                 "DATA_NODES_FILTER",
-                "CONSISTENCY_MODE"
+                "ZONE_CONSISTENCY_MODE"
         );
         return new SelectFromView<>(sql, zoneViewColumns, "ZONES", name(zoneName), row -> toZoneDefinitionBuilder(zoneName, row))
                 .executeAsync()
@@ -209,16 +210,18 @@ public class IgniteCatalogSqlImpl implements IgniteCatalog {
     }
 
     private static ZoneDefinition.Builder toZoneDefinitionBuilder(String zoneName, SqlRow row) {
-        int partitions = row.intValue("PARTITIONS");
-        int replicas = row.intValue("REPLICAS");
+        int partitions = row.intValue("ZONE_PARTITIONS");
+        int replicas = row.intValue("ZONE_REPLICAS");
+        int quorumsSize = row.intValue("ZONE_QUORUM_SIZE");
         int dataNodesAutoAdjustScaleUp = row.intValue("DATA_NODES_AUTO_ADJUST_SCALE_UP");
         int dataNodesAutoAdjustScaleDown = row.intValue("DATA_NODES_AUTO_ADJUST_SCALE_DOWN");
         String filter = row.stringValue("DATA_NODES_FILTER");
-        String consistencyMode = row.stringValue("CONSISTENCY_MODE");
+        String consistencyMode = row.stringValue("ZONE_CONSISTENCY_MODE");
 
         return ZoneDefinition.builder(zoneName)
                 .partitions(partitions)
                 .replicas(replicas)
+                .quorumSize(quorumsSize)
                 .dataNodesAutoAdjustScaleUp(dataNodesAutoAdjustScaleUp)
                 .dataNodesAutoAdjustScaleDown(dataNodesAutoAdjustScaleDown)
                 .filter(filter)
diff --git a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java
index 41a5a6a6447..0e4d9c4cac1 100644
--- a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java
+++ b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java
@@ -35,6 +35,10 @@ class Option extends QueryPart {
         return new Option("REPLICAS", replicas);
     }
 
+    public static Option quorumSize(Integer quorumSize) {
+        return new Option("QUORUM_SIZE", quorumSize);
+    }
+
     public static Option dataNodesAutoAdjust(Integer adjust) {
         return new Option("DATA_NODES_AUTO_ADJUST", adjust);
     }
diff --git a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java
index 653c3751651..7d84b905478 100644
--- a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java
+++ b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java
@@ -68,7 +68,8 @@ class CreateFromAnnotationsTest {
         ZoneDefinition zoneDefinition = ZoneDefinition.builder("zone_test")
                 .ifNotExists()
                 .partitions(1)
-                .replicas(3)
+                .replicas(5)
+                .quorumSize(2)
                 .distributionAlgorithm("partitionDistribution")
                 .dataNodesAutoAdjust(1)
                 .dataNodesAutoAdjustScaleDown(2)
@@ -77,8 +78,8 @@ class CreateFromAnnotationsTest {
                 .storageProfiles("default")
                 .consistencyMode("HIGH_AVAILABILITY")
                 .build();
-        Query query2 = new CreateFromDefinitionImpl(null).from(zoneDefinition);
-        String sqlZoneFromDefinition = query2.toString();
+        CreateFromDefinitionImpl query1 = new CreateFromDefinitionImpl(null).from(zoneDefinition);
+        String sqlZoneFromDefinition = query1.toString();
 
         TableDefinition tableDefinition = TableDefinition.builder("pojo_value_test")
                 .ifNotExists()
@@ -88,8 +89,8 @@ class CreateFromAnnotationsTest {
                 .zone(zoneDefinition.zoneName())
                 .index("ix_pojo", IndexType.DEFAULT, column("f_name"), column("l_name").desc())
                 .build();
-        CreateFromDefinitionImpl query1 = new CreateFromDefinitionImpl(null).from(tableDefinition);
-        String sqlTableFromDefinition = query1.toString();
+        CreateFromDefinitionImpl query2 = new CreateFromDefinitionImpl(null).from(tableDefinition);
+        String sqlTableFromDefinition = query2.toString();
 
         CreateFromAnnotationsImpl query = createTable().processKeyValueClasses(PojoKey.class, PojoValue.class);
         String sqlFromAnnotations = query.toString();
@@ -102,7 +103,7 @@ class CreateFromAnnotationsTest {
         CreateFromAnnotationsImpl query = createTable().processKeyValueClasses(Integer.class, PojoValue.class);
         assertThat(
                 query.toString(),
-                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=3,"
+                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=5, QUORUM_SIZE=2,"
                         + " DISTRIBUTION_ALGORITHM='partitionDistribution',"
                         + " DATA_NODES_AUTO_ADJUST=1, DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
                         + " DATA_NODES_FILTER='filter', CONSISTENCY_MODE='HIGH_AVAILABILITY';"
@@ -120,7 +121,7 @@ class CreateFromAnnotationsTest {
         CreateFromAnnotationsImpl query = createTable().processKeyValueClasses(PojoKey.class, PojoValue.class);
         assertThat(
                 query.toString(),
-                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=3,"
+                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=5, QUORUM_SIZE=2,"
                         + " DISTRIBUTION_ALGORITHM='partitionDistribution',"
                         + " DATA_NODES_AUTO_ADJUST=1, DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
                         + " DATA_NODES_FILTER='filter', CONSISTENCY_MODE='HIGH_AVAILABILITY';"
@@ -137,7 +138,7 @@ class CreateFromAnnotationsTest {
         CreateFromAnnotationsImpl query = createTable().processRecordClass(Pojo.class);
         assertThat(
                 query.toString(),
-                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=3,"
+                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=5, QUORUM_SIZE=2,"
                         + " DISTRIBUTION_ALGORITHM='partitionDistribution',"
                         + " DATA_NODES_AUTO_ADJUST=1, DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
                         + " DATA_NODES_FILTER='filter', CONSISTENCY_MODE='STRONG_CONSISTENCY';"
@@ -235,7 +236,8 @@ class CreateFromAnnotationsTest {
             zone = @Zone(
                     value = "zone_test",
                     partitions = 1,
-                    replicas = 3,
+                    replicas = 5,
+                    quorumSize = 2,
                     distributionAlgorithm = "partitionDistribution",
                     dataNodesAutoAdjust = 1,
                     dataNodesAutoAdjustScaleDown = 2,
@@ -266,7 +268,8 @@ class CreateFromAnnotationsTest {
             zone = @Zone(
                     value = "zone_test",
                     partitions = 1,
-                    replicas = 3,
+                    replicas = 5,
+                    quorumSize = 2,
                     distributionAlgorithm = "partitionDistribution",
                     dataNodesAutoAdjust = 1,
                     dataNodesAutoAdjustScaleDown = 2,
diff --git a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java
index 6543ea1b295..e2023d4ed5c 100644
--- a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java
+++ b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java
@@ -50,7 +50,8 @@ class CreateFromDefinitionTest {
         ZoneDefinition zone = ZoneDefinition.builder("zone_test")
                 .ifNotExists()
                 .partitions(3)
-                .replicas(3)
+                .replicas(5)
+                .quorumSize(2)
                 .distributionAlgorithm("partitionDistribution")
                 .dataNodesAutoAdjust(1)
                 .dataNodesAutoAdjustScaleDown(2)
@@ -62,7 +63,7 @@ class CreateFromDefinitionTest {
 
         assertThat(
                 createZone(zone),
-                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=3, REPLICAS=3,"
+                is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH STORAGE_PROFILES='default', PARTITIONS=3, REPLICAS=5, QUORUM_SIZE=2,"
                         + " DISTRIBUTION_ALGORITHM='partitionDistribution',"
                         + " DATA_NODES_AUTO_ADJUST=1, DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
                         + " DATA_NODES_FILTER='filter', CONSISTENCY_MODE='HIGH_AVAILABILITY';")
diff --git a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java
index 05b4a5e9f89..e5812ab9119 100644
--- a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java
+++ b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java
@@ -45,6 +45,7 @@ class InvalidDefinitionTest {
     void zone() {
         assertZoneBuilderNull(ZoneDefinition.Builder::partitions, 1, "Number of partitions");
         assertZoneBuilderNull(ZoneDefinition.Builder::replicas, 1, "Number of replicas");
+        assertZoneBuilderNull(ZoneDefinition.Builder::quorumSize, 1, "Quorum size");
 
         assertZoneBuilderNullOrBlank(ZoneDefinition.Builder::distributionAlgorithm, "a", "Partition distribution algorithm");