You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/05/11 18:06:27 UTC

[20/50] [abbrv] incubator-omid git commit: Fix HA initialization

Fix HA initialization

The HALeaseManagementModule was not initialized properly.
Also, the ZKModule is instantiated twice in certain configurations
, so it required the equals() and hashCode() methods implemented.

Change-Id: I21049e81abbeaebcec1bcb75ed2e391e0166c1aa


Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/2c33ff8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/2c33ff8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/2c33ff8b

Branch: refs/heads/master
Commit: 2c33ff8be8f580dc9e81e5a329ad4b757d42b738
Parents: bcdd3d1
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Thu Apr 28 15:49:52 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Thu Apr 28 15:49:57 2016 -0700

----------------------------------------------------------------------
 .../apache/omid/timestamp/storage/ZKModule.java | 28 +++++++-
 .../omid/tso/HALeaseManagementModule.java       | 67 ++++++++++++++++++--
 tso-server/src/main/resources/default-omid.yml  | 15 ++---
 .../client/TestTSOClientConnectionToTSO.java    |  6 +-
 4 files changed, 98 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/2c33ff8b/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
----------------------------------------------------------------------
diff --git a/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java b/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
index 468511e..0ce0cb7 100644
--- a/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
+++ b/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
@@ -19,8 +19,8 @@ package org.apache.omid.timestamp.storage;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import org.apache.omid.zk.ZKUtils;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.omid.zk.ZKUtils;
 
 import javax.inject.Singleton;
 import java.io.IOException;
@@ -46,4 +46,30 @@ public class ZKModule extends AbstractModule {
         return ZKUtils.initZKClient(zkCluster, namespace, 10);
     }
 
+    // ----------------------------------------------------------------------------------------------------------------
+    // NOTE: We need to implement equals() and hashCode() because the ZKModule is installed from several parent modules
+    // ----------------------------------------------------------------------------------------------------------------
+
+    @Override
+    public boolean equals(Object o) {
+
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ZKModule zkModule = (ZKModule) o;
+
+        if (!zkCluster.equals(zkModule.zkCluster)) return false;
+        return namespace.equals(zkModule.namespace);
+
+    }
+
+    @Override
+    public int hashCode() {
+
+        int result = zkCluster.hashCode();
+        result = 31 * result + namespace.hashCode();
+        return result;
+
+    }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/2c33ff8b/tso-server/src/main/java/org/apache/omid/tso/HALeaseManagementModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/HALeaseManagementModule.java b/tso-server/src/main/java/org/apache/omid/tso/HALeaseManagementModule.java
index 7821549..6bbec42 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/HALeaseManagementModule.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/HALeaseManagementModule.java
@@ -17,11 +17,12 @@
  */
 package org.apache.omid.tso;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import org.apache.curator.framework.CuratorFramework;
 import org.apache.omid.timestamp.storage.ZKModule;
 import org.apache.omid.tso.LeaseManagement.LeaseManagementException;
-import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,12 +34,22 @@ import static org.apache.omid.tso.TSOServer.TSO_HOST_AND_PORT_KEY;
 public class HALeaseManagementModule extends AbstractModule {
 
     private static final Logger LOG = LoggerFactory.getLogger(HALeaseManagementModule.class);
-    private final long leasePeriodInMs;
-    private final String tsoLeasePath;
-    private final String currentTsoPath;
-    private final String zkCluster;
-    private final String zkNamespace;
 
+    private long leasePeriodInMs = 10_000; // 10 secs
+    private String tsoLeasePath = "/tso-lease";
+    private String currentTsoPath = "/current-tso";
+    private String zkCluster = "localhost:2181";
+    private String zkNamespace = "omid";
+
+    // ----------------------------------------------------------------------------------------------------------------
+    // WARNING: Do not remove empty constructor, needed by snake_yaml!
+    // ----------------------------------------------------------------------------------------------------------------
+
+    public HALeaseManagementModule() {
+
+    }
+
+    @VisibleForTesting
     public HALeaseManagementModule(long leasePeriodInMs, String tsoLeasePath, String currentTsoPath,
                                    String zkCluster, String zkNamespace) {
 
@@ -78,4 +89,48 @@ public class HALeaseManagementModule extends AbstractModule {
 
     }
 
+    // ----------------------------------------------------------------------------------------------------------------
+    // WARNING: Do not remove getters/setters, needed by snake_yaml!
+    // ----------------------------------------------------------------------------------------------------------------
+
+    public String getCurrentTsoPath() {
+        return currentTsoPath;
+    }
+
+    public void setCurrentTsoPath(String currentTsoPath) {
+        this.currentTsoPath = currentTsoPath;
+    }
+
+    public long getLeasePeriodInMs() {
+        return leasePeriodInMs;
+    }
+
+    public void setLeasePeriodInMs(long leasePeriodInMs) {
+        this.leasePeriodInMs = leasePeriodInMs;
+    }
+
+    public String getTsoLeasePath() {
+        return tsoLeasePath;
+    }
+
+    public void setTsoLeasePath(String tsoLeasePath) {
+        this.tsoLeasePath = tsoLeasePath;
+    }
+
+    public String getZkCluster() {
+        return zkCluster;
+    }
+
+    public void setZkCluster(String zkCluster) {
+        this.zkCluster = zkCluster;
+    }
+
+    public String getZkNamespace() {
+        return zkNamespace;
+    }
+
+    public void setZkNamespace(String zkNamespace) {
+        this.zkNamespace = zkNamespace;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/2c33ff8b/tso-server/src/main/resources/default-omid.yml
----------------------------------------------------------------------
diff --git a/tso-server/src/main/resources/default-omid.yml b/tso-server/src/main/resources/default-omid.yml
index 85b2b53..4cffe98 100644
--- a/tso-server/src/main/resources/default-omid.yml
+++ b/tso-server/src/main/resources/default-omid.yml
@@ -23,7 +23,7 @@ timestampStoreModule: !!org.apache.omid.tso.InMemoryTimestampStorageModule [ ]
 commitTableStoreModule: !!org.apache.omid.tso.InMemoryCommitTableStorageModule [ ]
 leaseModule: !!org.apache.omid.tso.VoidLeaseManagementModule [ ]
 
-# Default stats/metrics configuration (
+# Default stats/metrics configuration
 metrics: !!org.apache.omid.metrics.NullMetricsProvider [ ]
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -132,13 +132,12 @@ metrics: !!org.apache.omid.metrics.NullMetricsProvider [ ]
 #
 # commitTableStoreModule: !!org.apache.omid.tso.DefaultHBaseCommitTableStorageModule [ ]
 # timestampStoreModule: !!org.apache.omid.tso.DefaultHBaseTimestampStorageModule [ ]
-# leaseModule: !!org.apache.omid.tso.HALeaseManagementModule [
-#     leasePeriodInMs: 10000,
-#     tsoLeasePath: "/tso-lease",
-#     zkCurrentTsoPath: "/current-tso",
-#     zkCluster: "localhost:2181",
-#     namespace: "omid"
-# ]
+# leaseModule: !!org.apache.omid.tso.HALeaseManagementModule
+#     leasePeriodInMs: 10000
+#     tsoLeasePath: "/tso-lease"
+#     currentTsoPath: "/current-tso"
+#     zkCluster: "localhost:2181"
+#     zkNamespace: "omid"
 # metrics: !!org.apache.omid.metrics.NullMetricsProvider [ ]
 
 

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/2c33ff8b/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientConnectionToTSO.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientConnectionToTSO.java b/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientConnectionToTSO.java
index 32fbd97..5e6aca9 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientConnectionToTSO.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientConnectionToTSO.java
@@ -19,6 +19,9 @@ package org.apache.omid.tso.client;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.test.TestingServer;
+import org.apache.curator.utils.CloseableUtils;
 import org.apache.omid.TestUtils;
 import org.apache.omid.tso.HALeaseManagementModule;
 import org.apache.omid.tso.TSOMockModule;
@@ -26,9 +29,6 @@ import org.apache.omid.tso.TSOServer;
 import org.apache.omid.tso.TSOServerConfig;
 import org.apache.omid.tso.VoidLeaseManagementModule;
 import org.apache.statemachine.StateMachine.FsmImpl;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.test.TestingServer;
-import org.apache.curator.utils.CloseableUtils;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;