You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/07/11 21:57:58 UTC
[03/17] git commit: [HELIX-380] Incompatibility issue with
HELIX_PROPERTYSTORE, HelixConnection port
[HELIX-380] Incompatibility issue with HELIX_PROPERTYSTORE, HelixConnection port
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/9524e510
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/9524e510
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/9524e510
Branch: refs/heads/master
Commit: 9524e510304152f249b51a19b12d287810be4712
Parents: 35e3ca1
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Fri Jul 11 10:44:41 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Fri Jul 11 10:44:41 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/helix/manager/zk/ZkHelixConnection.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/9524e510/helix-core/src/main/java/org/apache/helix/manager/zk/ZkHelixConnection.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkHelixConnection.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkHelixConnection.java
index 7bc5fa5..8c9c376 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkHelixConnection.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkHelixConnection.java
@@ -68,7 +68,7 @@ import org.apache.helix.api.id.SessionId;
import org.apache.helix.messaging.DefaultMessagingService;
import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
import org.apache.helix.store.HelixPropertyStore;
-import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.helix.store.zk.AutoFallbackPropertyStore;
import org.apache.log4j.Logger;
import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.Watcher.Event.KeeperState;
@@ -251,8 +251,9 @@ public class ZkHelixConnection implements HelixConnection, IZkStateListener {
@Override
public HelixPropertyStore<ZNRecord> createPropertyStore(ClusterId clusterId) {
PropertyKey key = new PropertyKey.Builder(clusterId.stringify()).propertyStore();
- return new ZkHelixPropertyStore<ZNRecord>(new ZkBaseDataAccessor<ZNRecord>(_zkclient),
- key.getPath(), null);
+ String fallbackPath = String.format("/%s/%s", clusterId.toString(), "HELIX_PROPERTYSTORE");
+ return new AutoFallbackPropertyStore<ZNRecord>(new ZkBaseDataAccessor<ZNRecord>(_zkclient),
+ key.getPath(), fallbackPath);
}
@Override