This is an automated email from the ASF dual-hosted git repository. nehapawar pushed a commit to branch disable_batching_by_default in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit bb42ef1ff687efbd5e8b9576a1661c57123bf5fe Author: Neha Pawar <[email protected]> AuthorDate: Thu Mar 7 12:53:50 2019 -0800 Set controller.enable.batch.message.mode to false by default --- .../java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java | 2 +- .../src/main/java/org/apache/pinot/controller/ControllerConf.java | 2 +- .../apache/pinot/controller/helix/core/PinotHelixResourceManager.java | 2 +- .../org/apache/pinot/controller/helix/PinotResourceManagerTest.java | 2 +- .../controller/helix/core/sharding/SegmentAssignmentStrategyTest.java | 2 +- .../org/apache/pinot/controller/validation/ValidationManagerTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java index 12d0c12..a9a7568 100644 --- a/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java +++ b/pinot-broker/src/test/java/org/apache/pinot/broker/broker/HelixBrokerStarterTest.java @@ -80,7 +80,7 @@ public class HelixBrokerStarterTest { final String instanceId = "localhost_helixController"; _pinotResourceManager = new PinotHelixResourceManager(ZkStarter.DEFAULT_ZK_STR, HELIX_CLUSTER_NAME, instanceId, null, 10000L, - true, /*isUpdateStateModel=*/false, true); + true, /*isUpdateStateModel=*/false, false); _pinotResourceManager.start(); _helixAdmin = _pinotResourceManager.getHelixAdmin(); diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java index 036add8..05203ae 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java @@ -138,7 +138,7 @@ public class ControllerConf extends PropertiesConfiguration { private static final long DEFAULT_SEGMENT_UPLOAD_TIMEOUT_IN_MILLIS = 600_000L; // 10 minutes private static final int DEFAULT_REALTIME_SEGMENT_METADATA_COMMIT_NUMLOCKS = 64; private static final boolean DEFAULT_ENABLE_STORAGE_QUOTA_CHECK = true; - private static final boolean DEFAULT_ENABLE_BATCH_MESSAGE_MODE = true; + private static final boolean DEFAULT_ENABLE_BATCH_MESSAGE_MODE = false; private static final String DEFAULT_PINOT_FS_FACTORY_CLASS_LOCAL = LocalPinotFS.class.getName(); diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java index ef119aa..73d7428 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java @@ -156,7 +156,7 @@ public class PinotHelixResourceManager { public PinotHelixResourceManager(@Nonnull String zkURL, @Nonnull String helixClusterName, @Nonnull String controllerInstanceId, @Nonnull String dataDir) { this(zkURL, helixClusterName, controllerInstanceId, dataDir, DEFAULT_EXTERNAL_VIEW_UPDATE_TIMEOUT_MILLIS, false, - false, true); + false, false); } public PinotHelixResourceManager(@Nonnull ControllerConf controllerConf) { diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java index 5ea12b5..550fe52 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/PinotResourceManagerTest.java @@ -56,7 +56,7 @@ public class PinotResourceManagerTest { final String instanceId = "localhost_helixController"; _pinotHelixResourceManager = new PinotHelixResourceManager(ZkStarter.DEFAULT_ZK_STR, HELIX_CLUSTER_NAME, instanceId, null, 10000L, true, - /*isUpdateStateModel=*/ false, true); + /*isUpdateStateModel=*/ false, false); _pinotHelixResourceManager.start(); _helixAdmin = _pinotHelixResourceManager.getHelixAdmin(); diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java index 9649a60..3879806 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/sharding/SegmentAssignmentStrategyTest.java @@ -81,7 +81,7 @@ public class SegmentAssignmentStrategyTest { final String instanceId = "localhost_helixController"; _pinotHelixResourceManager = new PinotHelixResourceManager(ZK_SERVER, HELIX_CLUSTER_NAME, instanceId, null, 10000L, true, /*isUpdateStateModel=*/ - false, true); + false, false); _pinotHelixResourceManager.start(); final String helixZkURL = HelixConfig.getAbsoluteZkPathForHelix(ZK_SERVER); diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java index 109ab8c..27b124f 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/validation/ValidationManagerTest.java @@ -80,7 +80,7 @@ public class ValidationManagerTest { _pinotHelixResourceManager = new PinotHelixResourceManager(ZK_STR, HELIX_CLUSTER_NAME, CONTROLLER_INSTANCE_NAME, null, 1000L, true, /*isUpdateStateModel=*/ - false, true); + false, false); _pinotHelixResourceManager.start(); ControllerRequestBuilderUtil.addFakeDataInstancesToAutoJoinHelixCluster(HELIX_CLUSTER_NAME, ZK_STR, 2, true); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
