date:20131231

git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

2013-12-31 Thread ctubbsii

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 379881e69 - 16ccbf5e1


ACCUMULO-2110 cannot remove a FileRef with a Path


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 16ccbf5e16467729b558cf08a379770cba10f5ab
Parents: 379881e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 31 14:26:29 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 15:22:11 2013 -0500

--
 .../src/main/java/org/apache/accumulo/tserver/Tablet.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/16ccbf5e/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 3c62a86..c4a2770 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -704,7 +704,7 @@ public class Tablet {
 ListFileRef files = MetadataTableUtil.getBulkFilesLoaded(conn, 
extent, tid);
 
 for (FileRef file : files)
-  if (paths.keySet().remove(file.path()))
+  if (paths.keySet().remove(file))
 log.debug(Ignoring request to re-import a file already imported: 
 + extent + :  + file);
 
 if (paths.size()  0) {
@@ -3565,7 +3565,7 @@ public class Tablet {
   String time = tabletTime.getMetadataValue();
 
   // it is possible that some of the bulk loading flags will be deleted 
after being read below because the bulk load
-  // finishes therefore split could propogate load flags for a 
finished bulk load... there is a special iterator
+  // finishes therefore split could propagate load flags for a 
finished bulk load... there is a special iterator
   // on the metadata table to clean up this type of garbage
   MapFileRef,Long bulkLoadedFiles = 
MetadataTableUtil.getBulkFilesLoaded(SystemCredentials.get(), extent);

[5/7] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

2013-12-31 Thread ecn

Merge branch '1.6.0-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT


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

Branch: refs/heads/master
Commit: 072d54e1fff58117de5aa392a22a075c0cf94cb9
Parents: ec77248 16ccbf5
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 31 15:23:47 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Dec 31 15:23:47 2013 -0500

--

--

[7/7] git commit: Merge branch '1.6.0-SNAPSHOT'

2013-12-31 Thread ecn

Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: cc4e8e7b5a24602e706a5d85ce662e882732191b
Parents: 3420097 072d54e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 31 15:24:16 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Dec 31 15:24:16 2013 -0500

--

--

[6/7] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

2013-12-31 Thread ecn

Merge branch '1.6.0-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 072d54e1fff58117de5aa392a22a075c0cf94cb9
Parents: ec77248 16ccbf5
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 31 15:23:47 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Dec 31 15:23:47 2013 -0500

--

--

[4/7] git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

2013-12-31 Thread ecn

ACCUMULO-2110 cannot remove a FileRef with a Path


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

Branch: refs/heads/master
Commit: 16ccbf5e16467729b558cf08a379770cba10f5ab
Parents: 379881e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 31 14:26:29 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 15:22:11 2013 -0500

--
 .../src/main/java/org/apache/accumulo/tserver/Tablet.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/16ccbf5e/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 3c62a86..c4a2770 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -704,7 +704,7 @@ public class Tablet {
 ListFileRef files = MetadataTableUtil.getBulkFilesLoaded(conn, 
extent, tid);
 
 for (FileRef file : files)
-  if (paths.keySet().remove(file.path()))
+  if (paths.keySet().remove(file))
 log.debug(Ignoring request to re-import a file already imported: 
 + extent + :  + file);
 
 if (paths.size()  0) {
@@ -3565,7 +3565,7 @@ public class Tablet {
   String time = tabletTime.getMetadataValue();
 
   // it is possible that some of the bulk loading flags will be deleted 
after being read below because the bulk load
-  // finishes therefore split could propogate load flags for a 
finished bulk load... there is a special iterator
+  // finishes therefore split could propagate load flags for a 
finished bulk load... there is a special iterator
   // on the metadata table to clean up this type of garbage
   MapFileRef,Long bulkLoadedFiles = 
MetadataTableUtil.getBulkFilesLoaded(SystemCredentials.get(), extent);

[3/7] git commit: Merge branch '1.6.0-SNAPSHOT'

2013-12-31 Thread ecn

Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 3420097ea29517f3dccd2377f840e0ca09e35405
Parents: bdc6c04 ec77248
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 31 14:26:50 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Dec 31 14:26:50 2013 -0500

--
 .../src/main/java/org/apache/accumulo/tserver/Tablet.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3420097e/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
--

[03/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

2013-12-31 Thread mdrob

ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

Signed-off-by: Mike Drob md...@cloudera.com


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d605ebb52a14d4d1964b01dcb5bb5ccad4fa6fb9
Parents: f56ae10
Author: Sean Busbey bus...@clouderagovt.com
Authored: Sat Dec 28 01:31:48 2013 -0600
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:31:14 2013 -0800

--
 test/system/auto/TestUtils.py   | 8 ++--
 test/system/auto/simple/readwrite.py| 5 ++---
 test/system/auto/simple/zooCacheTest.py | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f6eca67..3101cf9 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -47,6 +47,7 @@ if os.getenv('ACCUMULO_CONF_DIR'):
 else:
ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
 SITE = test- + ID
+SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
 
 WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 
@@ -261,7 +262,7 @@ class TestUtilsMixin:
 self.pkill(host, 'org.apache.accumulo.start', signal)
 
 def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+fp = open(SITE_PATH, 'w')
fp.write('configuration\n')
 settings = self.settings.copy()
 settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@ -433,6 +434,9 @@ class TestUtilsMixin:
   if os.path.exists(LOG_MONITOR_BACKUP):
  os.rename(LOG_MONITOR_BACKUP, LOG_MONITOR)
 
+def clean_config_file(self):
+  os.unlink(SITE_PATH)
+
 def sleep(self, secs):
 log.debug(Sleeping %f seconds % secs)
 sleep.sleep(secs)
@@ -455,7 +459,7 @@ class TestUtilsMixin:
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME 
+ '/logs/' + ID]))
   self.clean_logging() 
-  os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+  self.clean_config_file()
 
 def createTable(self, table, splitFile=None):
 if splitFile :

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/readwrite.py
--
diff --git a/test/system/auto/simple/readwrite.py 
b/test/system/auto/simple/readwrite.py
index 1e89a8d..13d2afa 100755
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@ -20,7 +20,7 @@ import unittest
 import time
 import sys
 
-from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE
+from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
 
 log = logging.getLogger('test.auto')
 
@@ -151,9 +151,8 @@ class SunnyLG(SunnyDayTest):
 }
 def runTest(self):
 SunnyDayTest.runTest(self)
-cfg = os.path.join(ACCUMULO_HOME, 'conf', SITE)
 import config
-dir = config.parse(cfg)['instance.dfs.dir']
+dir = config.parse(SITE_PATH)['instance.dfs.dir']
 handle = self.runOn(self.masterHost(),
 [self.accumulo_sh(),
  'org.apache.accumulo.core.file.rfile.PrintInfo',

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/zooCacheTest.py
--
diff --git a/test/system/auto/simple/zooCacheTest.py 
b/test/system/auto/simple/zooCacheTest.py
index b9beacb..998d800 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -18,7 +18,7 @@ import shutil
 import unittest
 import time
 
-from TestUtils import TestUtilsMixin, ACCUMULO_HOME, SITE, ZOOKEEPERS
+from TestUtils import TestUtilsMixin, ZOOKEEPERS
 
 class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 Zoo Cache Test
@@ -44,7 +44,7 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 self.waitForStop(handleR3, 1)
 
 def tearDown(self):
-os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+self.clean_config_file()
 shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
 
 def suite():

[02/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

2013-12-31 Thread mdrob

ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

Signed-off-by: Mike Drob md...@cloudera.com


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: d605ebb52a14d4d1964b01dcb5bb5ccad4fa6fb9
Parents: f56ae10
Author: Sean Busbey bus...@clouderagovt.com
Authored: Sat Dec 28 01:31:48 2013 -0600
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:31:14 2013 -0800

--
 test/system/auto/TestUtils.py   | 8 ++--
 test/system/auto/simple/readwrite.py| 5 ++---
 test/system/auto/simple/zooCacheTest.py | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f6eca67..3101cf9 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -47,6 +47,7 @@ if os.getenv('ACCUMULO_CONF_DIR'):
 else:
ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
 SITE = test- + ID
+SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
 
 WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 
@@ -261,7 +262,7 @@ class TestUtilsMixin:
 self.pkill(host, 'org.apache.accumulo.start', signal)
 
 def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+fp = open(SITE_PATH, 'w')
fp.write('configuration\n')
 settings = self.settings.copy()
 settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@ -433,6 +434,9 @@ class TestUtilsMixin:
   if os.path.exists(LOG_MONITOR_BACKUP):
  os.rename(LOG_MONITOR_BACKUP, LOG_MONITOR)
 
+def clean_config_file(self):
+  os.unlink(SITE_PATH)
+
 def sleep(self, secs):
 log.debug(Sleeping %f seconds % secs)
 sleep.sleep(secs)
@@ -455,7 +459,7 @@ class TestUtilsMixin:
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME 
+ '/logs/' + ID]))
   self.clean_logging() 
-  os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+  self.clean_config_file()
 
 def createTable(self, table, splitFile=None):
 if splitFile :

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/readwrite.py
--
diff --git a/test/system/auto/simple/readwrite.py 
b/test/system/auto/simple/readwrite.py
index 1e89a8d..13d2afa 100755
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@ -20,7 +20,7 @@ import unittest
 import time
 import sys
 
-from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE
+from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
 
 log = logging.getLogger('test.auto')
 
@@ -151,9 +151,8 @@ class SunnyLG(SunnyDayTest):
 }
 def runTest(self):
 SunnyDayTest.runTest(self)
-cfg = os.path.join(ACCUMULO_HOME, 'conf', SITE)
 import config
-dir = config.parse(cfg)['instance.dfs.dir']
+dir = config.parse(SITE_PATH)['instance.dfs.dir']
 handle = self.runOn(self.masterHost(),
 [self.accumulo_sh(),
  'org.apache.accumulo.core.file.rfile.PrintInfo',

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/zooCacheTest.py
--
diff --git a/test/system/auto/simple/zooCacheTest.py 
b/test/system/auto/simple/zooCacheTest.py
index b9beacb..998d800 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -18,7 +18,7 @@ import shutil
 import unittest
 import time
 
-from TestUtils import TestUtilsMixin, ACCUMULO_HOME, SITE, ZOOKEEPERS
+from TestUtils import TestUtilsMixin, ZOOKEEPERS
 
 class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 Zoo Cache Test
@@ -44,7 +44,7 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 self.waitForStop(handleR3, 1)
 
 def tearDown(self):
-os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+self.clean_config_file()
 shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
 
 def suite():

[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'

2013-12-31 Thread mdrob

Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: a1eb475ed2d0c2a0524ee7221297a783ce10e0c0
Parents: cc4e8e7 114b58d
Author: Mike Drob md...@cloudera.com
Authored: Tue Dec 31 13:38:25 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:38:25 2013 -0800

--

--

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-31 Thread mdrob

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
test/system/auto/simple/readwrite.py


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

Branch: refs/heads/master
Commit: 89c996229dc259fd6c4555d97e1da7b0d0f2e7a7
Parents: 20cc9f4 d605ebb
Author: Mike Drob md...@cloudera.com
Authored: Tue Dec 31 13:37:29 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:37:29 2013 -0800

--
 test/system/auto/TestUtils.py   | 8 ++--
 test/system/auto/simple/readwrite.py| 5 ++---
 test/system/auto/simple/zooCacheTest.py | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/TestUtils.py
--
diff --cc test/system/auto/TestUtils.py
index 32dc4b8,3101cf9..68d2a9c
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -47,7 -47,10 +47,8 @@@ if os.getenv('ACCUMULO_CONF_DIR')
  else:
 ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
  SITE = test- + ID
+ SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
  
 -WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 -
  LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
  LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
  LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'monitor_logger.xml')
@@@ -252,10 -259,10 +253,10 @@@ class TestUtilsMixin
  def stop_accumulo(self, signal=signal.SIGHUP):
  log.info('killing accumulo processes everywhere')
  for host in self.hosts:
 -self.pkill(host, 'org.apache.accumulo.start', signal)
 +self.pkill(host, 'accumulo.config.file', signal)
  
  def create_config_file(self, settings):
- fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp = open(SITE_PATH, 'w')
fp.write('configuration\n')
  settings = self.settings.copy()
  settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@@ -442,10 -455,11 +446,10 @@@
 ['hadoop', 'fs', '-rmr', ACCUMULO_DIR]))
self.wait(self.runClassOn(self.masterHost(),
  
'org.apache.accumulo.server.util.DeleteZooInstance',
 -[INSTANCE_NAME]))
 -  self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
 +['-i', INSTANCE_NAME]))
self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME 
+ '/logs/' + ID]))
self.clean_logging() 
-   os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+   self.clean_config_file()
  
  def createTable(self, table, splitFile=None):
  if splitFile :

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/readwrite.py
--
diff --cc test/system/auto/simple/readwrite.py
index 895daf5,13d2afa..d252677
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@@ -20,7 -20,7 +20,7 @@@ import unittes
  import time
  import sys
  
- from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE, 
INSTANCE_NAME, ROOT, ROOT_PASSWORD
 -from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
++from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH, INSTANCE_NAME, ROOT, 
ROOT_PASSWORD
  
  log = logging.getLogger('test.auto')
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/zooCacheTest.py
--

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-31 Thread mdrob

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
test/system/auto/simple/readwrite.py


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 89c996229dc259fd6c4555d97e1da7b0d0f2e7a7
Parents: 20cc9f4 d605ebb
Author: Mike Drob md...@cloudera.com
Authored: Tue Dec 31 13:37:29 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:37:29 2013 -0800

--
 test/system/auto/TestUtils.py   | 8 ++--
 test/system/auto/simple/readwrite.py| 5 ++---
 test/system/auto/simple/zooCacheTest.py | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/TestUtils.py
--
diff --cc test/system/auto/TestUtils.py
index 32dc4b8,3101cf9..68d2a9c
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -47,7 -47,10 +47,8 @@@ if os.getenv('ACCUMULO_CONF_DIR')
  else:
 ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
  SITE = test- + ID
+ SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
  
 -WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 -
  LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
  LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
  LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'monitor_logger.xml')
@@@ -252,10 -259,10 +253,10 @@@ class TestUtilsMixin
  def stop_accumulo(self, signal=signal.SIGHUP):
  log.info('killing accumulo processes everywhere')
  for host in self.hosts:
 -self.pkill(host, 'org.apache.accumulo.start', signal)
 +self.pkill(host, 'accumulo.config.file', signal)
  
  def create_config_file(self, settings):
- fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp = open(SITE_PATH, 'w')
fp.write('configuration\n')
  settings = self.settings.copy()
  settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@@ -442,10 -455,11 +446,10 @@@
 ['hadoop', 'fs', '-rmr', ACCUMULO_DIR]))
self.wait(self.runClassOn(self.masterHost(),
  
'org.apache.accumulo.server.util.DeleteZooInstance',
 -[INSTANCE_NAME]))
 -  self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
 +['-i', INSTANCE_NAME]))
self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME 
+ '/logs/' + ID]))
self.clean_logging() 
-   os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+   self.clean_config_file()
  
  def createTable(self, table, splitFile=None):
  if splitFile :

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/readwrite.py
--
diff --cc test/system/auto/simple/readwrite.py
index 895daf5,13d2afa..d252677
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@@ -20,7 -20,7 +20,7 @@@ import unittes
  import time
  import sys
  
- from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE, 
INSTANCE_NAME, ROOT, ROOT_PASSWORD
 -from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
++from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH, INSTANCE_NAME, ROOT, 
ROOT_PASSWORD
  
  log = logging.getLogger('test.auto')
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/zooCacheTest.py
--

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-31 Thread mdrob

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
test/system/auto/simple/readwrite.py


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 89c996229dc259fd6c4555d97e1da7b0d0f2e7a7
Parents: 20cc9f4 d605ebb
Author: Mike Drob md...@cloudera.com
Authored: Tue Dec 31 13:37:29 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:37:29 2013 -0800

--
 test/system/auto/TestUtils.py   | 8 ++--
 test/system/auto/simple/readwrite.py| 5 ++---
 test/system/auto/simple/zooCacheTest.py | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/TestUtils.py
--
diff --cc test/system/auto/TestUtils.py
index 32dc4b8,3101cf9..68d2a9c
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -47,7 -47,10 +47,8 @@@ if os.getenv('ACCUMULO_CONF_DIR')
  else:
 ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
  SITE = test- + ID
+ SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
  
 -WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 -
  LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
  LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
  LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'monitor_logger.xml')
@@@ -252,10 -259,10 +253,10 @@@ class TestUtilsMixin
  def stop_accumulo(self, signal=signal.SIGHUP):
  log.info('killing accumulo processes everywhere')
  for host in self.hosts:
 -self.pkill(host, 'org.apache.accumulo.start', signal)
 +self.pkill(host, 'accumulo.config.file', signal)
  
  def create_config_file(self, settings):
- fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp = open(SITE_PATH, 'w')
fp.write('configuration\n')
  settings = self.settings.copy()
  settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@@ -442,10 -455,11 +446,10 @@@
 ['hadoop', 'fs', '-rmr', ACCUMULO_DIR]))
self.wait(self.runClassOn(self.masterHost(),
  
'org.apache.accumulo.server.util.DeleteZooInstance',
 -[INSTANCE_NAME]))
 -  self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
 +['-i', INSTANCE_NAME]))
self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME 
+ '/logs/' + ID]))
self.clean_logging() 
-   os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+   self.clean_config_file()
  
  def createTable(self, table, splitFile=None):
  if splitFile :

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/readwrite.py
--
diff --cc test/system/auto/simple/readwrite.py
index 895daf5,13d2afa..d252677
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@@ -20,7 -20,7 +20,7 @@@ import unittes
  import time
  import sys
  
- from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE, 
INSTANCE_NAME, ROOT, ROOT_PASSWORD
 -from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
++from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH, INSTANCE_NAME, ROOT, 
ROOT_PASSWORD
  
  log = logging.getLogger('test.auto')
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/zooCacheTest.py
--

[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-12-31 Thread mdrob

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
test/system/auto/TestUtils.py
test/system/auto/simple/readwrite.py
test/system/auto/simple/zooCacheTest.py


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

Branch: refs/heads/master
Commit: 114b58dcaac6558f6f654e2ea15b6ed4bb641b3e
Parents: 072d54e 89c9962
Author: Mike Drob md...@cloudera.com
Authored: Tue Dec 31 13:38:14 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:38:14 2013 -0800

--

--

[01/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

2013-12-31 Thread mdrob

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT f56ae10b3 - d605ebb52
  refs/heads/1.5.1-SNAPSHOT 20cc9f4ec - 89c996229
  refs/heads/1.6.0-SNAPSHOT 072d54e1f - 114b58dca
  refs/heads/master cc4e8e7b5 - a1eb475ed


ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

Signed-off-by: Mike Drob md...@cloudera.com


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: d605ebb52a14d4d1964b01dcb5bb5ccad4fa6fb9
Parents: f56ae10
Author: Sean Busbey bus...@clouderagovt.com
Authored: Sat Dec 28 01:31:48 2013 -0600
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:31:14 2013 -0800

--
 test/system/auto/TestUtils.py   | 8 ++--
 test/system/auto/simple/readwrite.py| 5 ++---
 test/system/auto/simple/zooCacheTest.py | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f6eca67..3101cf9 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -47,6 +47,7 @@ if os.getenv('ACCUMULO_CONF_DIR'):
 else:
ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
 SITE = test- + ID
+SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
 
 WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 
@@ -261,7 +262,7 @@ class TestUtilsMixin:
 self.pkill(host, 'org.apache.accumulo.start', signal)
 
 def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+fp = open(SITE_PATH, 'w')
fp.write('configuration\n')
 settings = self.settings.copy()
 settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@ -433,6 +434,9 @@ class TestUtilsMixin:
   if os.path.exists(LOG_MONITOR_BACKUP):
  os.rename(LOG_MONITOR_BACKUP, LOG_MONITOR)
 
+def clean_config_file(self):
+  os.unlink(SITE_PATH)
+
 def sleep(self, secs):
 log.debug(Sleeping %f seconds % secs)
 sleep.sleep(secs)
@@ -455,7 +459,7 @@ class TestUtilsMixin:
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME 
+ '/logs/' + ID]))
   self.clean_logging() 
-  os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+  self.clean_config_file()
 
 def createTable(self, table, splitFile=None):
 if splitFile :

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/readwrite.py
--
diff --git a/test/system/auto/simple/readwrite.py 
b/test/system/auto/simple/readwrite.py
index 1e89a8d..13d2afa 100755
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@ -20,7 +20,7 @@ import unittest
 import time
 import sys
 
-from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE
+from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
 
 log = logging.getLogger('test.auto')
 
@@ -151,9 +151,8 @@ class SunnyLG(SunnyDayTest):
 }
 def runTest(self):
 SunnyDayTest.runTest(self)
-cfg = os.path.join(ACCUMULO_HOME, 'conf', SITE)
 import config
-dir = config.parse(cfg)['instance.dfs.dir']
+dir = config.parse(SITE_PATH)['instance.dfs.dir']
 handle = self.runOn(self.masterHost(),
 [self.accumulo_sh(),
  'org.apache.accumulo.core.file.rfile.PrintInfo',

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/zooCacheTest.py
--
diff --git a/test/system/auto/simple/zooCacheTest.py 
b/test/system/auto/simple/zooCacheTest.py
index b9beacb..998d800 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -18,7 +18,7 @@ import shutil
 import unittest
 import time
 
-from TestUtils import TestUtilsMixin, ACCUMULO_HOME, SITE, ZOOKEEPERS
+from TestUtils import TestUtilsMixin, ZOOKEEPERS
 
 class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 Zoo Cache Test
@@ -44,7 +44,7 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 self.waitForStop(handleR3, 1)
 
 def tearDown(self):
-os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+self.clean_config_file()
 shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)

[04/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

2013-12-31 Thread mdrob

ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

Signed-off-by: Mike Drob md...@cloudera.com


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

Branch: refs/heads/master
Commit: d605ebb52a14d4d1964b01dcb5bb5ccad4fa6fb9
Parents: f56ae10
Author: Sean Busbey bus...@clouderagovt.com
Authored: Sat Dec 28 01:31:48 2013 -0600
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:31:14 2013 -0800

--
 test/system/auto/TestUtils.py   | 8 ++--
 test/system/auto/simple/readwrite.py| 5 ++---
 test/system/auto/simple/zooCacheTest.py | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f6eca67..3101cf9 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -47,6 +47,7 @@ if os.getenv('ACCUMULO_CONF_DIR'):
 else:
ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
 SITE = test- + ID
+SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
 
 WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 
@@ -261,7 +262,7 @@ class TestUtilsMixin:
 self.pkill(host, 'org.apache.accumulo.start', signal)
 
 def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+fp = open(SITE_PATH, 'w')
fp.write('configuration\n')
 settings = self.settings.copy()
 settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@ -433,6 +434,9 @@ class TestUtilsMixin:
   if os.path.exists(LOG_MONITOR_BACKUP):
  os.rename(LOG_MONITOR_BACKUP, LOG_MONITOR)
 
+def clean_config_file(self):
+  os.unlink(SITE_PATH)
+
 def sleep(self, secs):
 log.debug(Sleeping %f seconds % secs)
 sleep.sleep(secs)
@@ -455,7 +459,7 @@ class TestUtilsMixin:
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
   self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME 
+ '/logs/' + ID]))
   self.clean_logging() 
-  os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+  self.clean_config_file()
 
 def createTable(self, table, splitFile=None):
 if splitFile :

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/readwrite.py
--
diff --git a/test/system/auto/simple/readwrite.py 
b/test/system/auto/simple/readwrite.py
index 1e89a8d..13d2afa 100755
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@ -20,7 +20,7 @@ import unittest
 import time
 import sys
 
-from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE
+from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
 
 log = logging.getLogger('test.auto')
 
@@ -151,9 +151,8 @@ class SunnyLG(SunnyDayTest):
 }
 def runTest(self):
 SunnyDayTest.runTest(self)
-cfg = os.path.join(ACCUMULO_HOME, 'conf', SITE)
 import config
-dir = config.parse(cfg)['instance.dfs.dir']
+dir = config.parse(SITE_PATH)['instance.dfs.dir']
 handle = self.runOn(self.masterHost(),
 [self.accumulo_sh(),
  'org.apache.accumulo.core.file.rfile.PrintInfo',

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d605ebb5/test/system/auto/simple/zooCacheTest.py
--
diff --git a/test/system/auto/simple/zooCacheTest.py 
b/test/system/auto/simple/zooCacheTest.py
index b9beacb..998d800 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -18,7 +18,7 @@ import shutil
 import unittest
 import time
 
-from TestUtils import TestUtilsMixin, ACCUMULO_HOME, SITE, ZOOKEEPERS
+from TestUtils import TestUtilsMixin, ZOOKEEPERS
 
 class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 Zoo Cache Test
@@ -44,7 +44,7 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 self.waitForStop(handleR3, 1)
 
 def tearDown(self):
-os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+self.clean_config_file()
 shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
 
 def suite():

[3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-12-31 Thread ctubbsii

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
test/system/auto/simple/examples.py


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b5e84bcd3108b446747e92a4915f7c7afe7f4a2c
Parents: 114b58d d63cf6f
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Dec 31 17:43:13 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:43:13 2013 -0500

--

--

[1/3] git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

2013-12-31 Thread ctubbsii

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 114b58dca - b5e84bcd3


ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Signed-off-by: Christopher Tubbs ctubb...@apache.org


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1ad1151ab0ae2c57ff998cf563cbe6a019994724
Parents: d605ebb
Author: Sean Busbey bus...@clouderagovt.com
Authored: Tue Dec 31 15:30:48 2013 -0600
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:28:43 2013 -0500

--
 test/system/auto/simple/examples.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ad1151a/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py 
b/test/system/auto/simple/examples.py
index bed321f..f05e58f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -124,8 +124,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
 self.comment(Creating a sharded index of the accumulo java files)
 self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
 self.execute('/bin/sh', '-c',
- 'find src -name *.java | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
- (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
+ 'find %s/src -name *.java | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
+ (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, ZOOKEEPERS, 
ROOT, ROOT_PASSWORD))
 self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Query',
  INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
  'foo', 'bar')

[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-31 Thread ctubbsii

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
test/system/auto/simple/examples.py


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d63cf6fe57ccc788e4b3a4ce3b187f0b252784e6
Parents: 89c9962 1ad1151
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Dec 31 17:33:35 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:33:35 2013 -0500

--
 test/system/auto/simple/examples.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d63cf6fe/test/system/auto/simple/examples.py
--
diff --cc test/system/auto/simple/examples.py
index 3ba425e,f05e58f..ba05174
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@@ -128,10 -124,10 +128,10 @@@ class Examples(TestUtilsMixin, unittest
  self.comment(Creating a sharded index of the accumulo java files)
  self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
  self.execute('/bin/sh', '-c',
-  'find server -name *.java | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p 
%s --partitions 30' %
-  (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
 - 'find %s/src -name *.java | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
++ 'find %s/server -name *.java | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p 
%s --partitions 30' %
+  (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, 
ZOOKEEPERS, ROOT, ROOT_PASSWORD))
  self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Query',
 - INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
 + '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', 
'-u', ROOT, '-p', ROOT_PASSWORD,
   'foo', 'bar')
  self.comment(Creating a word index of the sharded files)
  self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Reverse',

[1/3] git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

2013-12-31 Thread ctubbsii

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT b5e84bcd3 - 417902e21


ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Signed-off-by: Christopher Tubbs ctubb...@apache.org


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0b6749a4f75bc3fa3ea256c75e5e2ad86103fdb3
Parents: 1ad1151
Author: Sean Busbey bus...@clouderagovt.com
Authored: Tue Dec 31 16:31:07 2013 -0600
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:48:50 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 - 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b6749a4/test/system/auto/TestCombinerY.jar
--
diff --git a/test/system/auto/TestCombinerY.jar 
b/test/system/auto/TestCombinerY.jar
index 6cffd86..30da0cb 100644
Binary files a/test/system/auto/TestCombinerY.jar and 
b/test/system/auto/TestCombinerY.jar differ

git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

2013-12-31 Thread ctubbsii

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 1ad1151ab - 0b6749a4f


ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Signed-off-by: Christopher Tubbs ctubb...@apache.org


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 0b6749a4f75bc3fa3ea256c75e5e2ad86103fdb3
Parents: 1ad1151
Author: Sean Busbey bus...@clouderagovt.com
Authored: Tue Dec 31 16:31:07 2013 -0600
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:48:50 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 - 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b6749a4/test/system/auto/TestCombinerY.jar
--
diff --git a/test/system/auto/TestCombinerY.jar 
b/test/system/auto/TestCombinerY.jar
index 6cffd86..30da0cb 100644
Binary files a/test/system/auto/TestCombinerY.jar and 
b/test/system/auto/TestCombinerY.jar differ

[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-31 Thread ctubbsii

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 712e946d15786a8bc8e7bed49790cdadcfd134b4
Parents: d63cf6f 0b6749a
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Dec 31 17:49:03 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:49:03 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 - 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--

[3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-12-31 Thread ctubbsii

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 417902e218c566333b6ea5ac492186ae305e5e16
Parents: b5e84bc 712e946
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Dec 31 17:49:17 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:49:17 2013 -0500

--
 test/src/test/resources/TestCombinerY.jar | Bin 4335 - 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/417902e2/test/src/test/resources/TestCombinerY.jar
--
diff --cc test/src/test/resources/TestCombinerY.jar
index 6cffd86,000..30da0cb
mode 100644,00..100644
Binary files differ

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-31 Thread ctubbsii

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 712e946d15786a8bc8e7bed49790cdadcfd134b4
Parents: d63cf6f 0b6749a
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Dec 31 17:49:03 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Dec 31 17:49:03 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 - 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--

git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

[5/7] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

[7/7] git commit: Merge branch '1.6.0-SNAPSHOT'

[6/7] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

[4/7] git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

[3/7] git commit: Merge branch '1.6.0-SNAPSHOT'

[03/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

[02/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[01/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

[04/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

[3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[1/3] git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[1/3] git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

23 matches

Site Navigation

Mail list logo

Footer information