accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [3/3] git commit: Merge branch '1.6'
Date Wed, 29 Oct 2014 08:00:14 GMT
Merge branch '1.6'

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
	server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/efc75d1c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/efc75d1c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/efc75d1c

Branch: refs/heads/master
Commit: efc75d1c5bc9563b4fc7598ca30a137d713a83e9
Parents: e10b593 ca083a5
Author: Sean Busbey <busbey@cloudera.com>
Authored: Wed Oct 29 02:47:29 2014 -0500
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Wed Oct 29 02:47:29 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/server/ServerConstants.java    |  4 ----
 .../java/org/apache/accumulo/server/fs/VolumeUtil.java |  3 ++-
 .../org/apache/accumulo/server/init/Initialize.java    | 13 ++++++++-----
 .../java/org/apache/accumulo/server/util/FileUtil.java |  4 ++--
 .../apache/accumulo/server/util/MetadataTableUtil.java |  3 ++-
 .../apache/accumulo/server/util/TabletOperations.java  |  2 +-
 .../main/java/org/apache/accumulo/master/Master.java   |  2 +-
 .../org/apache/accumulo/master/TabletGroupWatcher.java |  6 +++---
 .../apache/accumulo/master/tableOps/CreateTable.java   |  3 ++-
 .../org/apache/accumulo/tserver/log/DfsLogger.java     |  3 ++-
 10 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/efc75d1c/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/efc75d1c/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/efc75d1c/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 602f214,14d5e98..cc2b469
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@@ -232,9 -224,10 +232,10 @@@ public class Initialize 
  
      UUID uuid = UUID.randomUUID();
      // the actual disk locations of the root table and tablets
-     String[] configuredTableDirs = VolumeConfiguration.prefix(VolumeConfiguration.getVolumeUris(SiteConfiguration.getInstance()),
-         ServerConstants.TABLE_DIR);
-     final Path rootTablet = new Path(fs.choose(configuredTableDirs) + "/" + RootTable.ID
+ RootTable.ROOT_TABLET_LOCATION);
 -    String[] configuredVolumes = VolumeConfiguration.getVolumeUris(ServerConfiguration.getSiteConfiguration());
++    String[] configuredVolumes = VolumeConfiguration.getVolumeUris(SiteConfiguration.getInstance());
+     final Path rootTablet = new Path(fs.choose(configuredVolumes) + Path.SEPARATOR + ServerConstants.TABLE_DIR
+ Path.SEPARATOR + RootTable.ID
+         + RootTable.ROOT_TABLET_LOCATION);
+ 
      try {
        initZooKeeper(opts, uuid.toString(), instanceNamePath, rootTablet);
      } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/efc75d1c/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 5f34279,03635cc..cb97d2a
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@@ -881,9 -880,10 +881,10 @@@ public class MetadataTableUtil 
        Key k = entry.getKey();
        Mutation m = new Mutation(k.getRow());
        m.putDelete(k.getColumnFamily(), k.getColumnQualifier());
-       String dir = volumeManager.choose(ServerConstants.getTablesDirs()) + "/" + tableId
+       String dir = volumeManager.choose(ServerConstants.getBaseUris()) + Constants.HDFS_TABLES_DIR
+ Path.SEPARATOR + tableId
            + new String(FastFormat.toZeroPaddedString(dirCount++, 8, 16, Constants.CLONE_PREFIX_BYTES));
 -      TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(dir.getBytes(Constants.UTF8)));
 +      TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(dir.getBytes(StandardCharsets.UTF_8)));
+ 
        bw.addMutation(m);
      }
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/efc75d1c/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/efc75d1c/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/efc75d1c/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------


Mime
View raw message