You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2013/12/31 22:38:47 UTC
[01/10] git commit: ACCUMULO-2109 make sure functional tests clean up
generate accumulo-site file.
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 <bu...@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():
[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by md...@apache.org.
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
----------------------------------------------------------------------
[04/10] git commit: ACCUMULO-2109 make sure functional tests clean up
generate accumulo-site file.
Posted by md...@apache.org.
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 <bu...@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.
Posted by md...@apache.org.
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 <bu...@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():
[08/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by md...@apache.org.
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/1.6.0-SNAPSHOT
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
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by md...@apache.org.
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
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/10] git commit: ACCUMULO-2109 make sure functional tests clean up
generate accumulo-site file.
Posted by md...@apache.org.
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 <bu...@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():
[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by md...@apache.org.
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
Posted by md...@apache.org.
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
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by md...@apache.org.
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
----------------------------------------------------------------------