accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1342419 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ test/system/auto/TestUtils.py test/system/auto/stress/bigRootTablet.py test/system/auto/stress/weird.py
Date Thu, 24 May 2012 19:50:44 GMT
Author: vines
Date: Thu May 24 19:50:44 2012
New Revision: 1342419

URL: http://svn.apache.org/viewvc?rev=1342419&view=rev
Log:
I hope I didn't break anything by merging back. But I forgot I was working on this in 1.4.x
for ACCUMULO-337


Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/server/   (props changed)
    accumulo/branches/1.4/test/system/auto/TestUtils.py
    accumulo/branches/1.4/test/system/auto/stress/bigRootTablet.py
    accumulo/branches/1.4/test/system/auto/stress/weird.py

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1342373

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1342373

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1342373

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1342373

Modified: accumulo/branches/1.4/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/auto/TestUtils.py?rev=1342419&r1=1342418&r2=1342419&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/auto/TestUtils.py (original)
+++ accumulo/branches/1.4/test/system/auto/TestUtils.py Thu May 24 19:50:44 2012
@@ -47,6 +47,7 @@ SITE = "test-" + ID
 WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
 LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
+LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
 General_CLASSPATH = ("$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,"
 "$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar") 
 
@@ -281,9 +282,12 @@ class TestUtilsMixin:
          os.rename(LOG_PROPERTIES, '%s.bkp' % LOG_PROPERTIES)
       if os.path.exists(LOG_GENERIC):
          os.rename(LOG_GENERIC, '%s.bkp' % LOG_GENERIC)
+      if os.path.exists(LOG_MONITOR):
+         os.rename(LOG_MONITOR, '%s.bkp' % LOG_MONITOR)
       
       shutil.copyfile('%s/conf/examples/512MB/standalone/log4j.properties' % ACCUMULO_HOME,
LOG_PROPERTIES)
       shutil.copyfile('%s/conf/examples/512MB/standalone/generic_logger.xml' % ACCUMULO_HOME,
LOG_GENERIC)
+      shutil.copyfile('%s/conf/examples/512MB/standalone/monitor_logger.xml' % ACCUMULO_HOME,
LOG_MONITOR)
       
 
     def start_accumulo_procs(self, safeMode=None):
@@ -396,12 +400,16 @@ class TestUtilsMixin:
     def clean_logging(self):
       LOG_PROPERTIES_BACKUP='%s.bkp' % LOG_PROPERTIES 
       LOG_GENERIC_BACKUP='%s.bkp' % LOG_GENERIC
+      LOG_MONITOR_BACKUP='%s.bkp' % LOG_MONITOR
       os.remove(LOG_PROPERTIES)
       os.remove(LOG_GENERIC)
+      os.remove(LOG_MONITOR)
       if os.path.exists(LOG_PROPERTIES_BACKUP):
         os.rename(LOG_PROPERTIES_BACKUP, LOG_PROPERTIES)
       if os.path.exists(LOG_GENERIC_BACKUP):
          os.rename(LOG_GENERIC_BACKUP, LOG_GENERIC)
+      if os.path.exists(LOG_MONITOR_BACKUP):
+         os.rename(LOG_MONITOR_BACKUP, LOG_MONITOR)
 
     def sleep(self, secs):
         log.debug("Sleeping %f seconds" % secs)

Modified: accumulo/branches/1.4/test/system/auto/stress/bigRootTablet.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/auto/stress/bigRootTablet.py?rev=1342419&r1=1342418&r2=1342419&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/auto/stress/bigRootTablet.py (original)
+++ accumulo/branches/1.4/test/system/auto/stress/bigRootTablet.py Thu May 24 19:50:44 2012
@@ -21,7 +21,7 @@ from TestUtils import TestUtilsMixin
 
 log = logging.getLogger('test.auto')
 
-class BigRootTablet(unittest.TestCase, TestUtilsMixin):
+class BigRootTablet(TestUtilsMixin, unittest.TestCase):
     "ACCUMULO-542: A large root tablet will fail to load if it does't fit in the tserver
scan buffers"
 
     order = 80
@@ -33,6 +33,9 @@ class BigRootTablet(unittest.TestCase, T
     def setUp(self):
         TestUtilsMixin.setUp(self);
     
+    def tearDown(self):
+        TestUtilsMixin.tearDown(self);
+    
     def runTest(self):
 	cmd = 'table !METADATA\naddsplits 0 1 2 3 4 5 6 7 8 9 a\n'
         for i in range(10):

Modified: accumulo/branches/1.4/test/system/auto/stress/weird.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/auto/stress/weird.py?rev=1342419&r1=1342418&r2=1342419&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/auto/stress/weird.py (original)
+++ accumulo/branches/1.4/test/system/auto/stress/weird.py Thu May 24 19:50:44 2012
@@ -22,7 +22,7 @@ from TestUtils import TestUtilsMixin
 
 log = logging.getLogger('test.auto')
 
-class LateLastContact(unittest.TestCase, TestUtilsMixin):
+class LateLastContact(TestUtilsMixin, unittest.TestCase):
     """Fake the "tablet stops talking but holds its lock" problem we see when hard drives
and NFS fail.
        Start a ZombieTServer, and see that master stops it.
     """
@@ -35,6 +35,9 @@ class LateLastContact(unittest.TestCase,
     def setUp(self):
         TestUtilsMixin.setUp(self);
     
+    def tearDown(self):
+        TestUtilsMixin.tearDown(self);
+
     def runTest(self):
         handle = self.runClassOn(self.masterHost(), 'org.apache.accumulo.server.test.functional.ZombieTServer',
[])
         out, err = handle.communicate()



Mime
View raw message