Author: jdcryans
Date: Tue Nov 2 00:21:30 2010
New Revision: 1029904
URL: http://svn.apache.org/viewvc?rev=1029904&view=rev
Log:
HBASE-3179 Enable ReplicationLogsCleaner only if replication is,
and fix its test
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1029904&r1=1029903&r2=1029904&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Nov 2 00:21:30 2010
@@ -637,6 +637,8 @@ Release 0.21.0 - Unreleased
HBASE-2006 Documentation of hbase-site.xml parameters
HBASE-2672 README.txt should contain basic information like how to run
or build HBase
+ HBASE-3179 Enable ReplicationLogsCleaner only if replication is,
+ and fix its test
IMPROVEMENTS
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java?rev=1029904&r1=1029903&r2=1029904&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java
Tue Nov 2 00:21:30 2010
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.master.LogCleanerDelegate;
import org.apache.hadoop.hbase.replication.ReplicationZookeeper;
@@ -52,6 +53,11 @@ public class ReplicationLogCleaner imple
@Override
public boolean isLogDeletable(Path filePath) {
+ // all members of this class are null if replication is disabled, and we
+ // return true since false would render the LogsCleaner useless
+ if (this.conf == null) {
+ return true;
+ }
String log = filePath.getName();
// If we saw the hlog previously, let's consider it's still used
// At some point in the future we will refresh the list and it will be gone
@@ -105,6 +111,10 @@ public class ReplicationLogCleaner imple
@Override
public void setConf(Configuration conf) {
+ // If replication is disabled, keep all members null
+ if (!conf.getBoolean(HConstants.REPLICATION_ENABLE_KEY, false)) {
+ return;
+ }
// Make my own Configuration. Then I'll have my own connection to zk that
// I can close myself when comes time.
this.conf = new Configuration(conf);
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java?rev=1029904&r1=1029903&r2=1029904&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
Tue Nov 2 00:21:30 2010
@@ -21,7 +21,9 @@ package org.apache.hadoop.hbase.master;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
import java.net.URLEncoder;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
@@ -29,21 +31,18 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.Stoppable;
+import org.apache.hadoop.hbase.Server;
+import org.apache.hadoop.hbase.catalog.CatalogTracker;
import org.apache.hadoop.hbase.replication.ReplicationZookeeper;
-import org.junit.After;
+import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
public class TestLogsCleaner {
private final static HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
- private ReplicationZookeeper zkHelper;
-
/**
* @throws java.lang.Exception
*/
@@ -60,48 +59,20 @@ public class TestLogsCleaner {
TEST_UTIL.shutdownMiniZKCluster();
}
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
+ @Test
+ public void testLogCleaning() throws Exception{
Configuration conf = TEST_UTIL.getConfiguration();
- /* TODO REENABLE
- zkHelper = new ReplicationZookeeperWrapper(
- ZooKeeperWrapper.createInstance(conf, HRegionServer.class.getName()),
- conf, new AtomicBoolean(true), "test-cluster");
- */
- }
+ conf.setBoolean(HConstants.REPLICATION_ENABLE_KEY, true);
+ Server server = new DummyServer();
+ ReplicationZookeeper zkHelper =
+ new ReplicationZookeeper(server, new AtomicBoolean(true));
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- @Ignore @Test /* REENABLE -- DISABLED UNTIL REPLICATION BROUGHT UP TO NEW
MASTER */
- public void testLogCleaning() throws Exception{
- Configuration c = TEST_UTIL.getConfiguration();
Path oldLogDir = new Path(HBaseTestingUtility.getTestDir(),
HConstants.HREGION_OLDLOGDIR_NAME);
- String fakeMachineName = URLEncoder.encode("regionserver:60020", "UTF8");
+ String fakeMachineName = URLEncoder.encode(server.getServerName(), "UTF8");
- FileSystem fs = FileSystem.get(c);
- Stoppable stoppable = new Stoppable() {
- private volatile boolean stopped = false;
-
- @Override
- public void stop(String why) {
- this.stopped = true;
- }
-
- @Override
- public boolean isStopped() {
- return this.stopped;
- }
- };
- LogCleaner cleaner = new LogCleaner(1000, stoppable, c, fs, oldLogDir);
+ FileSystem fs = FileSystem.get(conf);
+ LogCleaner cleaner = new LogCleaner(1000, server, conf, fs, oldLogDir);
// Create 2 invalid files, 1 "recent" file, 1 very new file and 30 old
files
long now = System.currentTimeMillis();
@@ -125,7 +96,7 @@ public class TestLogsCleaner {
// (TimeToLiveLogCleaner) but would be rejected by the second
// (ReplicationLogCleaner)
if (i % (30/3) == 0) {
-// REENABLE zkHelper.addLogToList(fileName.getName(), fakeMachineName);
+ zkHelper.addLogToList(fileName.getName(), fakeMachineName);
System.out.println("Replication log file: " + fileName);
}
}
@@ -153,7 +124,46 @@ public class TestLogsCleaner {
assertEquals(5, fs.listStatus(oldLogDir).length);
for (FileStatus file : fs.listStatus(oldLogDir)) {
- System.out.println("Keeped log files: " + file.getPath().getName());
+ System.out.println("Kept log files: " + file.getPath().getName());
+ }
+ }
+
+ static class DummyServer implements Server {
+
+ @Override
+ public Configuration getConfiguration() {
+ return TEST_UTIL.getConfiguration();
+ }
+
+ @Override
+ public ZooKeeperWatcher getZooKeeper() {
+ try {
+ return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ public CatalogTracker getCatalogTracker() {
+ return null;
+ }
+
+ @Override
+ public String getServerName() {
+ return "regionserver,60020,000000";
+ }
+
+ @Override
+ public void abort(String why, Throwable e) {}
+
+ @Override
+ public void stop(String why) {}
+
+ @Override
+ public boolean isStopped() {
+ return false;
}
}
}
\ No newline at end of file
