You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2022/12/15 03:57:59 UTC
[helix] branch master updated (c9d1eb187 -> fc1d0e184)
This is an automated email from the ASF dual-hosted git repository.
jxue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
from c9d1eb187 Revert "Reducing zk operations default retry timeout. (#2293)"
new c74aff173 Revert "Revert "Reducing zk operations default retry timeout. (#2293)""
new fc1d0e184 Revert "[maven-release-plugin] prepare release helix-1.1.0"
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-admin-webapp/pom.xml | 2 +-
helix-agent/pom.xml | 2 +-
helix-common/pom.xml | 2 +-
helix-core/pom.xml | 2 +-
helix-front/pom.xml | 2 +-
helix-lock/pom.xml | 2 +-
helix-rest/pom.xml | 4 ++--
helix-view-aggregator/pom.xml | 2 +-
metadata-store-directory-common/pom.xml | 2 +-
metrics-common/pom.xml | 2 +-
pom.xml | 6 +++---
recipes/distributed-lock-manager/pom.xml | 2 +-
recipes/pom.xml | 2 +-
recipes/rabbitmq-consumer-group/pom.xml | 2 +-
recipes/rsync-replicated-file-system/pom.xml | 2 +-
recipes/service-discovery/pom.xml | 2 +-
recipes/task-execution/pom.xml | 2 +-
zookeeper-api/pom.xml | 2 +-
.../org/apache/helix/zookeeper/api/client/RealmAwareZkClient.java | 4 +++-
.../main/java/org/apache/helix/zookeeper/impl/client/ZkClient.java | 4 +++-
20 files changed, 27 insertions(+), 23 deletions(-)
[helix] 01/02: Revert "Revert "Reducing zk operations default retry timeout. (#2293)""
Posted by jx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jxue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
commit c74aff173fabee7324ba021df0ec2668094b9c2f
Author: Junkai Xue <jx...@apache.org>
AuthorDate: Wed Dec 14 19:57:28 2022 -0800
Revert "Revert "Reducing zk operations default retry timeout. (#2293)""
This reverts commit c9d1eb187a12826af38776537353023a33a324d9.
---
.../org/apache/helix/zookeeper/api/client/RealmAwareZkClient.java | 4 +++-
.../main/java/org/apache/helix/zookeeper/impl/client/ZkClient.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/api/client/RealmAwareZkClient.java b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/api/client/RealmAwareZkClient.java
index 99874c7eb..ac0240d5f 100644
--- a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/api/client/RealmAwareZkClient.java
+++ b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/api/client/RealmAwareZkClient.java
@@ -63,7 +63,9 @@ public interface RealmAwareZkClient {
SINGLE_REALM, MULTI_REALM
}
- int DEFAULT_OPERATION_TIMEOUT = Integer.MAX_VALUE;
+ // Setting default operation retry timeout to 24 hours. It can also be overwritten via RealmAwareZkClientConfig.
+ // This timeout will be used while retrying zookeeper operations.
+ int DEFAULT_OPERATION_TIMEOUT = 24 * 60 * 60 * 1000;
int DEFAULT_CONNECTION_TIMEOUT = 60 * 1000;
int DEFAULT_SESSION_TIMEOUT = 30 * 1000;
diff --git a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/impl/client/ZkClient.java b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/impl/client/ZkClient.java
index 7e5c80a7e..915a60777 100644
--- a/zookeeper-api/src/main/java/org/apache/helix/zookeeper/impl/client/ZkClient.java
+++ b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/impl/client/ZkClient.java
@@ -61,7 +61,9 @@ import org.slf4j.LoggerFactory;
public class ZkClient extends org.apache.helix.zookeeper.zkclient.ZkClient implements HelixZkClient {
private static Logger LOG = LoggerFactory.getLogger(ZkClient.class);
- public static final int DEFAULT_OPERATION_TIMEOUT = Integer.MAX_VALUE;
+ // Setting default operation retry timeout to 24 hours. It can also be overwritten via RealmAwareZkClientConfig.
+ // This timeout will be used while retrying zookeeper operations.
+ public static final int DEFAULT_OPERATION_TIMEOUT = 24 * 60 * 60 * 1000;
public static final int DEFAULT_CONNECTION_TIMEOUT = 60 * 1000;
public static final int DEFAULT_SESSION_TIMEOUT = 30 * 1000;
[helix] 02/02: Revert "[maven-release-plugin] prepare release helix-1.1.0"
Posted by jx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jxue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
commit fc1d0e18432b05c91153df703741f50a819c15de
Author: Junkai Xue <jx...@apache.org>
AuthorDate: Wed Dec 14 19:57:52 2022 -0800
Revert "[maven-release-plugin] prepare release helix-1.1.0"
This reverts commit eba2ca842e6f8ed328a713d059a834d156d6c606.
---
helix-admin-webapp/pom.xml | 2 +-
helix-agent/pom.xml | 2 +-
helix-common/pom.xml | 2 +-
helix-core/pom.xml | 2 +-
helix-front/pom.xml | 2 +-
helix-lock/pom.xml | 2 +-
helix-rest/pom.xml | 4 ++--
helix-view-aggregator/pom.xml | 2 +-
metadata-store-directory-common/pom.xml | 2 +-
metrics-common/pom.xml | 2 +-
pom.xml | 6 +++---
recipes/distributed-lock-manager/pom.xml | 2 +-
recipes/pom.xml | 2 +-
recipes/rabbitmq-consumer-group/pom.xml | 2 +-
recipes/rsync-replicated-file-system/pom.xml | 2 +-
recipes/service-discovery/pom.xml | 2 +-
recipes/task-execution/pom.xml | 2 +-
zookeeper-api/pom.xml | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index ff7210091..6cf8ab936 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/helix-agent/pom.xml b/helix-agent/pom.xml
index bd1965596..cb71f7b7b 100644
--- a/helix-agent/pom.xml
+++ b/helix-agent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<artifactId>helix-agent</artifactId>
<packaging>bundle</packaging>
diff --git a/helix-common/pom.xml b/helix-common/pom.xml
index c63174197..1ec1f2a86 100644
--- a/helix-common/pom.xml
+++ b/helix-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 2ce082725..af7981755 100755
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/helix-front/pom.xml b/helix-front/pom.xml
index f569d9f40..e8e31606c 100644
--- a/helix-front/pom.xml
+++ b/helix-front/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/helix-lock/pom.xml b/helix-lock/pom.xml
index d919d4e5b..595c55cb5 100644
--- a/helix-lock/pom.xml
+++ b/helix-lock/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/helix-rest/pom.xml b/helix-rest/pom.xml
index 140a575f5..3e6af7dfe 100644
--- a/helix-rest/pom.xml
+++ b/helix-rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
</organization>
<properties>
- <revision>1.1.0</revision>
+ <revision>1.0.5-SNAPSHOT</revision>
<osgi.import>
org.apache.helix*,
org.apache.commons.cli*,
diff --git a/helix-view-aggregator/pom.xml b/helix-view-aggregator/pom.xml
index a2bbfd1cb..89c543f24 100644
--- a/helix-view-aggregator/pom.xml
+++ b/helix-view-aggregator/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/metadata-store-directory-common/pom.xml b/metadata-store-directory-common/pom.xml
index 2571f83c8..44728019a 100644
--- a/metadata-store-directory-common/pom.xml
+++ b/metadata-store-directory-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/metrics-common/pom.xml b/metrics-common/pom.xml
index 49e537d94..770d7afcc 100644
--- a/metrics-common/pom.xml
+++ b/metrics-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index dd3e04349..493c8362f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
<packaging>pom</packaging>
<name>Apache Helix</name>
@@ -389,7 +389,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/helix.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/helix.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=helix.git;a=summary</url>
- <tag>helix-1.1.0</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
<system>Github</system>
@@ -403,7 +403,7 @@
<properties>
<revision>1.1.1-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>1670404913</project.build.outputTimestamp>
+ <project.build.outputTimestamp>1654806798</project.build.outputTimestamp>
<sonar.host.url>https://analysis.apache.org/</sonar.host.url>
diff --git a/recipes/distributed-lock-manager/pom.xml b/recipes/distributed-lock-manager/pom.xml
index ca6e2a42c..224037a76 100644
--- a/recipes/distributed-lock-manager/pom.xml
+++ b/recipes/distributed-lock-manager/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.helix.recipes</groupId>
<artifactId>recipes</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<artifactId>distributed-lock-manager</artifactId>
diff --git a/recipes/pom.xml b/recipes/pom.xml
index 058b864e0..f1b9c9c12 100644
--- a/recipes/pom.xml
+++ b/recipes/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<groupId>org.apache.helix.recipes</groupId>
<artifactId>recipes</artifactId>
diff --git a/recipes/rabbitmq-consumer-group/pom.xml b/recipes/rabbitmq-consumer-group/pom.xml
index 32315e05f..1a634ddcb 100644
--- a/recipes/rabbitmq-consumer-group/pom.xml
+++ b/recipes/rabbitmq-consumer-group/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.helix.recipes</groupId>
<artifactId>recipes</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<artifactId>rabbitmq-consumer-group</artifactId>
diff --git a/recipes/rsync-replicated-file-system/pom.xml b/recipes/rsync-replicated-file-system/pom.xml
index cd83ee540..746764053 100644
--- a/recipes/rsync-replicated-file-system/pom.xml
+++ b/recipes/rsync-replicated-file-system/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.helix.recipes</groupId>
<artifactId>recipes</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<artifactId>rsync-replicated-file-system</artifactId>
diff --git a/recipes/service-discovery/pom.xml b/recipes/service-discovery/pom.xml
index 298a99343..9f539ba52 100644
--- a/recipes/service-discovery/pom.xml
+++ b/recipes/service-discovery/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.helix.recipes</groupId>
<artifactId>recipes</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<artifactId>service-discovery</artifactId>
diff --git a/recipes/task-execution/pom.xml b/recipes/task-execution/pom.xml
index 565121a82..38240c5d0 100644
--- a/recipes/task-execution/pom.xml
+++ b/recipes/task-execution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.helix.recipes</groupId>
<artifactId>recipes</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<artifactId>task-execution</artifactId>
diff --git a/zookeeper-api/pom.xml b/zookeeper-api/pom.xml
index f37e95938..e4fffb9a6 100644
--- a/zookeeper-api/pom.xml
+++ b/zookeeper-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.helix</groupId>
<artifactId>helix</artifactId>
- <version>1.1.0</version>
+ <version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>