Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1492844 - in
 /accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core:
 Constants.java client/ZooKeeperInstance.java
Date: Thu, 13 Jun 2013 20:16:00 -0000
To: commits@accumulo.apache.org
From: vines@apache.org
Message-Id: <20130613201601.12B4A23888E4@eris.apache.org>

Author: vines
Date: Thu Jun 13 20:16:00 2013
New Revision: 1492844

URL: http://svn.apache.org/r1492844
Log:
ACCUMULO-715 Migrated ZKInstance to curator


Modified:
    accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java
    accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java

Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1492844&r1=1492843&r2=1492844&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java Thu Jun 13 20:16:00 2013
@@ -99,7 +99,8 @@ public class Constants {
   public static final String METADATA_DELETE_FLAG_PREFIX = "~del";
   public static final String METADATA_DELETE_FLAG_FOR_METADATA_PREFIX = "!!" + METADATA_DELETE_FLAG_PREFIX;
   public static final Range METADATA_DELETES_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_PREFIX)), true, new Key(new Text("~dem")), false);
-  public static final Range METADATA_DELETES_FOR_METADATA_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_FOR_METADATA_PREFIX)), true, new Key(new Text("!!~dem")), false);
+  public static final Range METADATA_DELETES_FOR_METADATA_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_FOR_METADATA_PREFIX)), true, new Key(
+      new Text("!!~dem")), false);
   public static final String METADATA_BLIP_FLAG_PREFIX = "~blip"; // BLIP = bulk load in progress
   public static final Range METADATA_BLIP_KEYSPACE = new Range(new Key(new Text(METADATA_BLIP_FLAG_PREFIX)), true, new Key(new Text("~bliq")), false);
   
@@ -197,7 +198,6 @@ public class Constants {
   public static String getRootTabletDir(final AccumuloConfiguration conf) {
     return getMetadataTableDir(conf) + ZROOT_TABLET;
   }
-
   
   /**
    * @param conf
@@ -206,6 +206,8 @@ public class Constants {
   public static String getWalDirectory(final AccumuloConfiguration conf) {
     return getBaseDir(conf) + "/wal";
   }
-
-    public static final String AUDITLOG = "Audit";
+  
+  public static final String AUDITLOG = "Audit";
+  public static final String ZROOT_CURATOR_SERVICE = "root_tablet";
+  public static final String MASTER_CURATOR_SERVICE = "master";
 }

Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1492844&r1=1492843&r2=1492844&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Thu Jun 13 20:16:00 2013
@@ -37,8 +37,14 @@ import org.apache.accumulo.core.util.Byt
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.TextUtil;
-import org.apache.accumulo.core.zookeeper.ZooUtil;
-import org.apache.accumulo.fate.zookeeper.ZooCache;
+import org.apache.accumulo.fate.curator.CuratorUtil;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.x.discovery.ServiceDiscovery;
+import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
+import org.apache.curator.x.discovery.ServiceProvider;
+import org.apache.curator.x.discovery.strategies.RandomStrategy;
+import org.apache.curator.x.discovery.strategies.StickyStrategy;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -67,9 +73,11 @@ public class ZooKeeperInstance implement
   private String instanceId = null;
   private String instanceName = null;
   
-  private final ZooCache zooCache;
-  
-  private final String zooKeepers;
+  private final CuratorFramework curator;
+  // http://curator.incubator.apache.org/curator-x-discovery/index.html
+  private ServiceDiscovery<String> discovery;
+  private ServiceProvider<String> rootService;
+  private ServiceProvider<String> masterService;
   
   private final int zooKeepersSessionTimeOut;
   
@@ -98,10 +106,15 @@ public class ZooKeeperInstance implement
   public ZooKeeperInstance(String instanceName, String zooKeepers, int sessionTimeout) {
     ArgumentChecker.notNull(instanceName, zooKeepers);
     this.instanceName = instanceName;
-    this.zooKeepers = zooKeepers;
     this.zooKeepersSessionTimeOut = sessionTimeout;
-    zooCache = ZooCache.getInstance(zooKeepers, sessionTimeout);
-    getInstanceID();
+    
+    // Need to create curator for getInstanceId
+    curator = constructCurator(zooKeepers, sessionTimeout).usingNamespace(Constants.ZROOT + Constants.ZINSTANCES);
+    this.instanceId = getInstanceID();
+    
+    // And now that we have the ID, we can set the namespace
+    curator.usingNamespace(Constants.ZROOT + '/' + getInstanceID());
+    setupDiscoveries(curator);
   }
   
   /**
@@ -129,29 +142,59 @@ public class ZooKeeperInstance implement
   public ZooKeeperInstance(UUID instanceId, String zooKeepers, int sessionTimeout) {
     ArgumentChecker.notNull(instanceId, zooKeepers);
     this.instanceId = instanceId.toString();
-    this.zooKeepers = zooKeepers;
     this.zooKeepersSessionTimeOut = sessionTimeout;
-    zooCache = ZooCache.getInstance(zooKeepers, sessionTimeout);
+    curator = constructCurator(zooKeepers, sessionTimeout).usingNamespace(Constants.ZROOT + '/' + getInstanceID());
+    
+    setupDiscoveries(curator);
+  }
+  
+  private CuratorFramework constructCurator(String zookeeperConnectString, int sessionTimeoutMs) {
+    return CuratorFrameworkFactory.builder().canBeReadOnly(true).sessionTimeoutMs(sessionTimeoutMs).retryPolicy(CuratorUtil.retry)
+        .connectString(zookeeperConnectString).build();
+  }
+  
+  private void setupDiscoveries(CuratorFramework curator2) {
+    try {
+      discovery = ServiceDiscoveryBuilder.builder(String.class).client(curator).basePath(Constants.ZROOT_TABLET_LOCATION).build();
+      discovery.start();
+      rootService = discovery.serviceProviderBuilder().serviceName(Constants.ZROOT_CURATOR_SERVICE)
+          .providerStrategy(new StickyStrategy<String>(new RandomStrategy<String>())).build();
+      masterService = discovery.serviceProviderBuilder().serviceName(Constants.MASTER_CURATOR_SERVICE)
+          .providerStrategy(new StickyStrategy<String>(new RandomStrategy<String>())).build();
+      rootService.start();
+      masterService.start();
+    } catch (Exception e) {
+      // We should have encountered any known Zookeeper issues by now.
+      throw new RuntimeException(e);
+    }
   }
   
   @Override
   public String getInstanceID() {
     if (instanceId == null) {
-      // want the instance id to be stable for the life of this instance object,
-      // so only get it once
-      String instanceNamePath = Constants.ZROOT + Constants.ZINSTANCES + "/" + instanceName;
-      byte[] iidb = zooCache.get(instanceNamePath);
-      if (iidb == null) {
+      // want the instance id to be stable for the life of this instance object, so only get it once
+      // And this will ONLY be invoked once iff the constructors using instanceName are used
+      // And the namespace will already be set to the instance path
+      byte[] iidb;
+      try {
+        iidb = curator.getData().forPath(instanceName);
+      } catch (Exception e) {
         throw new RuntimeException("Instance name " + instanceName
-            + " does not exist in zookeeper.  Run \"accumulo org.apache.accumulo.server.util.ListInstances\" to see a list.");
+            + " does not exist in zookeeper.  Run \"accumulo org.apache.accumulo.server.util.ListInstances\" to see a list.", e);
       }
+      
       instanceId = new String(iidb);
     }
     
-    if (zooCache.get(Constants.ZROOT + "/" + instanceId) == null) {
-      if (instanceName == null)
-        throw new RuntimeException("Instance id " + instanceId + " does not exist in zookeeper");
-      throw new RuntimeException("Instance id " + instanceId + " pointed to by the name " + instanceName + " does not exist in zookeeper");
+    try {
+      if (curator.usingNamespace(Constants.ZROOT).checkExists().forPath(instanceId) == null) {
+        if (instanceName == null)
+          throw new RuntimeException("Instance id " + instanceId + " does not exist in zookeeper");
+        throw new RuntimeException("Instance id " + instanceId + " pointed to by the name " + instanceName + " does not exist in zookeeper");
+      }
+    } catch (Exception e) {
+      // Should only happen if things are in a very bad state, I think
+      throw new RuntimeException(e);
     }
     
     return instanceId;
@@ -159,10 +202,16 @@ public class ZooKeeperInstance implement
   
   @Override
   public List<String> getMasterLocations() {
-    String masterLocPath = ZooUtil.getRoot(this) + Constants.ZMASTER_LOCK;
-    
-    OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up master location in zoocache.");
-    byte[] loc = ZooUtil.getLockData(zooCache, masterLocPath);
+    OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up master location using curator service discovery.");
+    String loc;
+    try {
+      loc = masterService.getInstance().getPayload();
+    } catch (Exception e) {
+      opTimer.stop("Failed to find master location in curator discovery service");
+      // Zookeeper errors are handles, big ones hit already. This is probably very bad?
+      log.error(e,e);
+      return Collections.emptyList();
+    }
     opTimer.stop("Found master at " + (loc == null ? null : new String(loc)) + " in %DURATION%");
     
     if (loc == null) {
@@ -174,30 +223,31 @@ public class ZooKeeperInstance implement
   
   @Override
   public String getRootTabletLocation() {
-    String zRootLocPath = ZooUtil.getRoot(this) + Constants.ZROOT_TABLET_LOCATION;
-    
-    OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location in zookeeper.");
-    byte[] loc = zooCache.get(zRootLocPath);
-    opTimer.stop("Found root tablet at " + (loc == null ? null : new String(loc)) + " in %DURATION%");
-    
-    if (loc == null) {
+    OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location using curator service discovery.");
+    String loc;
+    try {
+      loc = rootService.getInstance().getPayload();
+    } catch (Exception e) {
+      opTimer.stop("Failed to find root tablet in curator discovery service");
+      // Zookeeper errors are handles, big ones hit already. This is probably very bad?
+      log.error(e,e);
       return null;
     }
-    
-    return new String(loc).split("\\|")[0];
+    opTimer.stop("Found root tablet at " + (loc == null ? null : new String(loc)) + " in %DURATION%");
+    return loc;
   }
   
   @Override
   public String getInstanceName() {
     if (instanceName == null)
-      instanceName = lookupInstanceName(zooCache, UUID.fromString(getInstanceID()));
+      instanceName = lookupInstanceName(curator, UUID.fromString(getInstanceID()));
     
     return instanceName;
   }
   
   @Override
   public String getZooKeepers() {
-    return zooKeepers;
+    return curator.getZookeeperClient().getCurrentConnectionString();
   }
   
   @Override
@@ -248,30 +298,29 @@ public class ZooKeeperInstance implement
   }
   
   /**
-   * @deprecated Use {@link #lookupInstanceName(org.apache.accumulo.fate.zookeeper.ZooCache, UUID)} instead
-   */
-  @Deprecated
-  public static String lookupInstanceName(org.apache.accumulo.core.zookeeper.ZooCache zooCache, UUID instanceId) {
-    return lookupInstanceName((ZooCache) zooCache, instanceId);
-  }
-  
-  /**
    * Given a zooCache and instanceId, look up the instance name.
    * 
-   * @param zooCache
+   * @param curator
    * @param instanceId
    * @return the instance name
    */
-  public static String lookupInstanceName(ZooCache zooCache, UUID instanceId) {
-    ArgumentChecker.notNull(zooCache, instanceId);
-    for (String name : zooCache.getChildren(Constants.ZROOT + Constants.ZINSTANCES)) {
-      String instanceNamePath = Constants.ZROOT + Constants.ZINSTANCES + "/" + name;
-      UUID iid = UUID.fromString(new String(zooCache.get(instanceNamePath)));
-      if (iid.equals(instanceId)) {
-        return name;
+  public static String lookupInstanceName(CuratorFramework curator, UUID instanceId) {
+    ArgumentChecker.notNull(curator, instanceId);
+    curator = curator.usingNamespace(Constants.ZROOT);
+    try {
+      for (String name : curator.getChildren().forPath(Constants.ZINSTANCES)) {
+        String instanceNamePath = Constants.ZINSTANCES + "/" + name;
+        UUID iid = UUID.fromString(new String(curator.getData().forPath(instanceNamePath)));
+        if (iid.equals(instanceId)) {
+          return name;
+        }
       }
+      return null;
+    } catch (Exception e) {
+      // Should only happen if things are in a very bad state, I think
+      log.error(e,e);
+      return null;
     }
-    return null;
   }
   
   /**