You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by hu...@apache.org on 2019/06/01 00:23:27 UTC
[helix] branch helix-0.9-release updated (745868b -> a97bddb)
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a change to branch helix-0.9-release
in repository https://gitbox.apache.org/repos/asf/helix.git.
from 745868b Bug fix: reuse the stable logics to verfiy the difference between idealStates and externalViews
new 1c9da1b Upgrade ZK to 3.4.13
new a97bddb Remove cluster view related code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
helix-core/helix-core-0.8.5-SNAPSHOT.ivy | 2 +-
helix-core/pom.xml | 2 +-
.../java/org/apache/helix/model/ClusterConfig.java | 60 ----------------------
3 files changed, 2 insertions(+), 62 deletions(-)
[helix] 02/02: Remove cluster view related code
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch helix-0.9-release
in repository https://gitbox.apache.org/repos/asf/helix.git
commit a97bddbb7fe16f8ba30dffde15f43cfc767aca66
Author: Hunter Lee <hu...@linkedin.com>
AuthorDate: Fri May 31 17:22:58 2019 -0700
Remove cluster view related code
---
.../java/org/apache/helix/model/ClusterConfig.java | 60 ----------------------
1 file changed, 60 deletions(-)
diff --git a/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java b/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java
index bbbaa72..00aa134 100644
--- a/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java
@@ -33,7 +33,6 @@ import org.apache.helix.ZNRecord;
import org.apache.helix.api.config.HelixConfigProperty;
import org.apache.helix.api.config.StateTransitionThrottleConfig;
import org.apache.helix.api.config.StateTransitionTimeoutConfig;
-import org.apache.helix.api.config.ViewClusterSourceConfig;
import com.google.common.collect.Maps;
@@ -84,10 +83,6 @@ public class ClusterConfig extends HelixProperty {
// partitons that need recovery or in
// error exceeds this limitation
DISABLED_INSTANCES,
- VIEW_CLUSTER, // Set to "true" to indicate this is a view cluster
- VIEW_CLUSTER_SOURCES, // Map field, key is the name of source cluster, value is
- // ViewClusterSourceConfig JSON string
- VIEW_CLUSTER_REFRESH_PERIOD, // In second
// Specifies job types and used for quota allocation
QUOTA_TYPES
@@ -101,7 +96,6 @@ public class ClusterConfig extends HelixProperty {
// is not set and will be given a default value of 1
private final static int DEFAULT_ERROR_OR_RECOVERY_PARTITION_THRESHOLD_FOR_LOAD_BALANCE = -1;
private static final String IDEAL_STATE_RULE_PREFIX = "IdealStateRule!";
- private final static int DEFAULT_VIEW_CLUSTER_REFRESH_PERIOD = 30;
public final static String TASK_QUOTA_RATIO_NOT_SET = "-1";
@@ -122,36 +116,6 @@ public class ClusterConfig extends HelixProperty {
super(record);
}
- public void setViewCluster() {
- _record.setBooleanField(ClusterConfigProperty.VIEW_CLUSTER.name(), true);
- }
-
- /**
- * Whether this cluster is a ViewCluster
- * @return
- */
- public boolean isViewCluster() {
- return _record
- .getBooleanField(ClusterConfigProperty.VIEW_CLUSTER.name(), false);
- }
-
- /**
- * Set a list of ViewClusterSourceConfig to ClusterConfig. Current source config will be
- * overwritten
- * @param sourceConfigList
- */
- public void setViewClusterSourceConfigs(List<ViewClusterSourceConfig> sourceConfigList) {
- List<String> sourceConfigs = new ArrayList<>();
- for (ViewClusterSourceConfig config : sourceConfigList) {
- try {
- sourceConfigs.add(config.toJson());
- } catch (IOException e) {
- throw new IllegalArgumentException("Invalid source config. Error: " + e.toString());
- }
- }
- _record.setListField(ClusterConfigProperty.VIEW_CLUSTER_SOURCES.name(), sourceConfigs);
- }
-
/**
* Set task quota type with the ratio of this quota.
* @param quotaType String
@@ -222,30 +186,6 @@ public class ClusterConfig extends HelixProperty {
}
/**
- * Set view cluster max refresh period
- * @param refreshPeriod refresh period in second
- */
- public void setViewClusterRefreshPeriod(int refreshPeriod) {
- _record.setIntField(ClusterConfigProperty.VIEW_CLUSTER_REFRESH_PERIOD.name(),
- refreshPeriod);
- }
-
- public List<ViewClusterSourceConfig> getViewClusterSourceConfigs() {
- List<ViewClusterSourceConfig> sourceConfigList = new ArrayList<>();
- for (String configJSON : _record
- .getListField(ClusterConfigProperty.VIEW_CLUSTER_SOURCES.name())) {
- ViewClusterSourceConfig config = ViewClusterSourceConfig.fromJson(configJSON);
- sourceConfigList.add(config);
- }
- return sourceConfigList;
- }
-
- public int getViewClusterRefershPeriod() {
- return _record.getIntField(ClusterConfigProperty.VIEW_CLUSTER_REFRESH_PERIOD.name(),
- DEFAULT_VIEW_CLUSTER_REFRESH_PERIOD);
- }
-
- /**
* Whether to persist best possible assignment in a resource's idealstate.
*
* @return
[helix] 01/02: Upgrade ZK to 3.4.13
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch helix-0.9-release
in repository https://gitbox.apache.org/repos/asf/helix.git
commit 1c9da1bd9704d141bd87260d2f80aca7763d05e7
Author: Hunter Lee <hu...@linkedin.com>
AuthorDate: Fri May 31 17:08:03 2019 -0700
Upgrade ZK to 3.4.13
---
helix-core/helix-core-0.8.5-SNAPSHOT.ivy | 2 +-
helix-core/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/helix-core/helix-core-0.8.5-SNAPSHOT.ivy b/helix-core/helix-core-0.8.5-SNAPSHOT.ivy
index 3f4f9a6..c61b78f 100644
--- a/helix-core/helix-core-0.8.5-SNAPSHOT.ivy
+++ b/helix-core/helix-core-0.8.5-SNAPSHOT.ivy
@@ -52,7 +52,7 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
- <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.11" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.13" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 9b6cf44..d446b10 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -85,7 +85,7 @@ under the License.
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.11</version>
+ <version>3.4.13</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>