Author: stack
Date: Tue Sep 21 21:44:21 2010
New Revision: 999660
URL: http://svn.apache.org/viewvc?rev=999660&view=rev
Log:
HBASE-3022 Change format of enum messages in o.a.h.h.executor package
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseMetaHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRootHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Sep 21 21:44:21 2010
@@ -922,6 +922,7 @@ Release 0.21.0 - Unreleased
HBASE-2941 port HADOOP-6713 - threading scalability for RPC reads - to
HBase
HBASE-2782 QOS for META table access
HBASE-3017 More log pruning
+ HBASE-3022 Change format of enum messages in o.a.h.h.executor package
NEW FEATURES
HBASE-1961 HBase EC2 scripts
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
Tue Sep 21 21:44:21 2010
@@ -100,31 +100,31 @@ public abstract class EventHandler imple
public enum EventType {
// Messages originating from RS (NOTE: there is NO direct communication
from
// RS to Master). These are a result of RS updates into ZK.
- RS2ZK_REGION_CLOSING (1), // RS is in process of closing a region
- RS2ZK_REGION_CLOSED (2), // RS has finished closing a region
- RS2ZK_REGION_OPENING (3), // RS is in process of opening a region
- RS2ZK_REGION_OPENED (4), // RS has finished opening a region
+ RS_ZK_REGION_CLOSING (1), // RS is in process of closing a region
+ RS_ZK_REGION_CLOSED (2), // RS has finished closing a region
+ RS_ZK_REGION_OPENING (3), // RS is in process of opening a region
+ RS_ZK_REGION_OPENED (4), // RS has finished opening a region
// Messages originating from Master to RS
- M2RS_OPEN_REGION (20), // Master asking RS to open a region
- M2RS_OPEN_ROOT (21), // Master asking RS to open root
- M2RS_OPEN_META (22), // Master asking RS to open meta
- M2RS_CLOSE_REGION (23), // Master asking RS to close a region
- M2RS_CLOSE_ROOT (24), // Master asking RS to close root
- M2RS_CLOSE_META (25), // Master asking RS to close meta
+ M_RS_OPEN_REGION (20), // Master asking RS to open a region
+ M_RS_OPEN_ROOT (21), // Master asking RS to open root
+ M_RS_OPEN_META (22), // Master asking RS to open meta
+ M_RS_CLOSE_REGION (23), // Master asking RS to close a region
+ M_RS_CLOSE_ROOT (24), // Master asking RS to close root
+ M_RS_CLOSE_META (25), // Master asking RS to close meta
// Messages originating from Client to Master
- C2M_DELETE_TABLE (40), // Client asking Master to delete a table
- C2M_DISABLE_TABLE (41), // Client asking Master to disable a
table
- C2M_ENABLE_TABLE (42), // Client asking Master to enable a table
- C2M_MODIFY_TABLE (43), // Client asking Master to modify a table
- C2M_ADD_FAMILY (44), // Client asking Master to add family to
table
- C2M_DELETE_FAMILY (45), // Client asking Master to delete family
of table
- C2M_MODIFY_FAMILY (46), // Client asking Master to modify family
of table
+ C_M_DELETE_TABLE (40), // Client asking Master to delete a table
+ C_M_DISABLE_TABLE (41), // Client asking Master to disable a
table
+ C_M_ENABLE_TABLE (42), // Client asking Master to enable a table
+ C_M_MODIFY_TABLE (43), // Client asking Master to modify a table
+ C_M_ADD_FAMILY (44), // Client asking Master to add family to
table
+ C_M_DELETE_FAMILY (45), // Client asking Master to delete family
of table
+ C_M_MODIFY_FAMILY (46), // Client asking Master to modify family
of table
// Updates from master to ZK. This is done by the master and there is
// nothing to process by either Master or RS
- M2ZK_REGION_OFFLINE (50), // Master adds this region as offline in
ZK
+ M_ZK_REGION_OFFLINE (50), // Master adds this region as offline in
ZK
// Master controlled events to be executed on the master
M_SERVER_SHUTDOWN (70); // Master is processing shutdown of a RS
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java
Tue Sep 21 21:44:21 2010
@@ -106,39 +106,39 @@ public class ExecutorService {
switch(type) {
// Master executor services
- case RS2ZK_REGION_CLOSED:
+ case RS_ZK_REGION_CLOSED:
return ExecutorType.MASTER_CLOSE_REGION;
- case RS2ZK_REGION_OPENED:
+ case RS_ZK_REGION_OPENED:
return ExecutorType.MASTER_OPEN_REGION;
case M_SERVER_SHUTDOWN:
return ExecutorType.MASTER_SERVER_OPERATIONS;
- case C2M_DELETE_TABLE:
- case C2M_DISABLE_TABLE:
- case C2M_ENABLE_TABLE:
- case C2M_MODIFY_TABLE:
+ case C_M_DELETE_TABLE:
+ case C_M_DISABLE_TABLE:
+ case C_M_ENABLE_TABLE:
+ case C_M_MODIFY_TABLE:
return ExecutorType.MASTER_TABLE_OPERATIONS;
// RegionServer executor services
- case M2RS_OPEN_REGION:
+ case M_RS_OPEN_REGION:
return ExecutorType.RS_OPEN_REGION;
- case M2RS_OPEN_ROOT:
+ case M_RS_OPEN_ROOT:
return ExecutorType.RS_OPEN_ROOT;
- case M2RS_OPEN_META:
+ case M_RS_OPEN_META:
return ExecutorType.RS_OPEN_META;
- case M2RS_CLOSE_REGION:
+ case M_RS_CLOSE_REGION:
return ExecutorType.RS_CLOSE_REGION;
- case M2RS_CLOSE_ROOT:
+ case M_RS_CLOSE_ROOT:
return ExecutorType.RS_CLOSE_ROOT;
- case M2RS_CLOSE_META:
+ case M_RS_CLOSE_META:
return ExecutorType.RS_CLOSE_META;
default:
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Tue Sep 21 21:44:21 2010
@@ -33,7 +33,6 @@ import java.util.NavigableMap;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -190,7 +189,7 @@ public class AssignmentManager extends Z
MetaReader.getRegion(catalogTracker, data.getRegionName()).getFirst();
String encodedName = regionInfo.getEncodedName();
switch(data.getEventType()) {
- case RS2ZK_REGION_CLOSING:
+ case RS_ZK_REGION_CLOSING:
// Just insert region into RIT.
// If this never updates the timeout will trigger new assignment
regionsInTransition.put(encodedName,
@@ -198,7 +197,7 @@ public class AssignmentManager extends Z
data.getStamp()));
break;
- case RS2ZK_REGION_CLOSED:
+ case RS_ZK_REGION_CLOSED:
// Region is closed, insert into RIT and handle it
regionsInTransition.put(encodedName,
new RegionState(regionInfo, RegionState.State.CLOSED,
@@ -206,7 +205,7 @@ public class AssignmentManager extends Z
new ClosedRegionHandler(master, this, data, regionInfo).process();
break;
- case RS2ZK_REGION_OPENING:
+ case RS_ZK_REGION_OPENING:
// Just insert region into RIT
// If this never updates the timeout will trigger new assignment
regionsInTransition.put(encodedName,
@@ -214,7 +213,7 @@ public class AssignmentManager extends Z
data.getStamp()));
break;
- case RS2ZK_REGION_OPENED:
+ case RS_ZK_REGION_OPENED:
// Region is opened, insert into RIT and handle it
regionsInTransition.put(encodedName,
new RegionState(regionInfo, RegionState.State.OPENING,
@@ -250,11 +249,11 @@ public class AssignmentManager extends Z
", server=" + data.getServerName() + ", region=" +
prettyPrintedRegionName);
RegionState regionState = regionsInTransition.get(encodedName);
switch(data.getEventType()) {
- case M2ZK_REGION_OFFLINE:
+ case M_ZK_REGION_OFFLINE:
// Nothing to do.
break;
- case RS2ZK_REGION_CLOSING:
+ case RS_ZK_REGION_CLOSING:
// Should see CLOSING after we have asked it to CLOSE or additional
// times after already being in state of CLOSING
if (regionState == null ||
@@ -269,7 +268,7 @@ public class AssignmentManager extends Z
regionState.update(RegionState.State.CLOSING, data.getStamp());
break;
- case RS2ZK_REGION_CLOSED:
+ case RS_ZK_REGION_CLOSED:
// Should see CLOSED after CLOSING but possible after PENDING_CLOSE
if (regionState == null ||
(!regionState.isPendingClose() && !regionState.isClosing())) {
@@ -287,7 +286,7 @@ public class AssignmentManager extends Z
this, data, regionState.getRegion()));
break;
- case RS2ZK_REGION_OPENING:
+ case RS_ZK_REGION_OPENING:
// Should see OPENING after we have asked it to OPEN or additional
// times after already being in state of OPENING
if(regionState == null ||
@@ -303,7 +302,7 @@ public class AssignmentManager extends Z
regionState.update(RegionState.State.OPENING, data.getStamp());
break;
- case RS2ZK_REGION_OPENED:
+ case RS_ZK_REGION_OPENED:
// Should see OPENED after OPENING but possible after PENDING_OPEN
if(regionState == null ||
(!regionState.isPendingOpen() && !regionState.isOpening())) {
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
Tue Sep 21 21:44:21 2010
@@ -63,7 +63,7 @@ public class ClosedRegionHandler extends
public ClosedRegionHandler(Server server,
AssignmentManager assignmentManager, RegionTransitionData data,
HRegionInfo regionInfo) {
- super(server, EventType.RS2ZK_REGION_CLOSED);
+ super(server, EventType.RS_ZK_REGION_CLOSED);
this.assignmentManager = assignmentManager;
this.data = data;
this.regionInfo = regionInfo;
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
Tue Sep 21 21:44:21 2010
@@ -34,7 +34,7 @@ public class DeleteTableHandler extends
public DeleteTableHandler(byte [] tableName, Server server,
final MasterServices masterServices) throws IOException {
- super(EventType.C2M_DELETE_TABLE, tableName, server, masterServices);
+ super(EventType.C_M_DELETE_TABLE, tableName, server, masterServices);
}
@Override
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
Tue Sep 21 21:44:21 2010
@@ -44,7 +44,7 @@ public class DisableTableHandler extends
public DisableTableHandler(Server server, byte [] tableName,
CatalogTracker catalogTracker, AssignmentManager assignmentManager)
throws TableNotFoundException, IOException {
- super(server, EventType.C2M_DISABLE_TABLE);
+ super(server, EventType.C_M_DISABLE_TABLE);
this.tableName = tableName;
this.tableNameStr = Bytes.toString(this.tableName);
this.assignmentManager = assignmentManager;
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
Tue Sep 21 21:44:21 2010
@@ -45,7 +45,7 @@ public class EnableTableHandler extends
public EnableTableHandler(Server server, byte [] tableName,
CatalogTracker catalogTracker, AssignmentManager assignmentManager)
throws TableNotFoundException, IOException {
- super(server, EventType.C2M_ENABLE_TABLE);
+ super(server, EventType.C_M_ENABLE_TABLE);
this.tableName = tableName;
this.tableNameStr = Bytes.toString(tableName);
this.ct = catalogTracker;
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
Tue Sep 21 21:44:21 2010
@@ -34,7 +34,7 @@ public class ModifyTableHandler extends
public ModifyTableHandler(final byte [] tableName,
final HTableDescriptor htd, final Server server,
final MasterServices masterServices) throws IOException {
- super(EventType.C2M_MODIFY_TABLE, tableName, server, masterServices);
+ super(EventType.C_M_MODIFY_TABLE, tableName, server, masterServices);
this.htd = htd;
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
Tue Sep 21 21:44:21 2010
@@ -59,7 +59,7 @@ public class OpenedRegionHandler extends
public OpenedRegionHandler(Server server,
AssignmentManager assignmentManager, RegionTransitionData data,
HRegionInfo regionInfo, HServerInfo serverInfo) {
- super(server, EventType.RS2ZK_REGION_OPENED);
+ super(server, EventType.RS_ZK_REGION_OPENED);
this.assignmentManager = assignmentManager;
this.data = data;
this.regionInfo = regionInfo;
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java
Tue Sep 21 21:44:21 2010
@@ -40,7 +40,7 @@ public class TableAddFamilyHandler exten
public TableAddFamilyHandler(byte[] tableName, HColumnDescriptor familyDesc,
Server server, final MasterServices masterServices) throws IOException {
- super(EventType.C2M_ADD_FAMILY, tableName, server, masterServices);
+ super(EventType.C_M_ADD_FAMILY, tableName, server, masterServices);
this.familyDesc = familyDesc;
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java
Tue Sep 21 21:44:21 2010
@@ -40,7 +40,7 @@ public class TableDeleteFamilyHandler ex
public TableDeleteFamilyHandler(byte[] tableName, byte [] familyName,
Server server, final MasterServices masterServices) throws IOException {
- super(EventType.C2M_ADD_FAMILY, tableName, server, masterServices);
+ super(EventType.C_M_ADD_FAMILY, tableName, server, masterServices);
this.familyName = familyName;
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java
Tue Sep 21 21:44:21 2010
@@ -41,7 +41,7 @@ public class TableModifyFamilyHandler ex
public TableModifyFamilyHandler(byte[] tableName,
HColumnDescriptor familyDesc, Server server,
final MasterServices masterServices) throws IOException {
- super(EventType.C2M_MODIFY_FAMILY, tableName, server, masterServices);
+ super(EventType.C_M_MODIFY_FAMILY, tableName, server, masterServices);
this.familyDesc = familyDesc;
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseMetaHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseMetaHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseMetaHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseMetaHandler.java
Tue Sep 21 21:44:21 2010
@@ -38,6 +38,6 @@ public class CloseMetaHandler extends Cl
final RegionServerServices rsServices,
final HRegionInfo regionInfo,
final boolean abort, final boolean zk) {
- super(server, rsServices, regionInfo, abort, zk,
EventType.M2RS_CLOSE_META);
+ super(server, rsServices, regionInfo, abort, zk,
EventType.M_RS_CLOSE_META);
}
}
\ No newline at end of file
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
Tue Sep 21 21:44:21 2010
@@ -75,7 +75,7 @@ public class CloseRegionHandler extends
public CloseRegionHandler(final Server server,
final RegionServerServices rsServices,
final HRegionInfo regionInfo, final boolean abort, final boolean zk) {
- this(server, rsServices, regionInfo, abort, zk,
EventType.M2RS_CLOSE_REGION);
+ this(server, rsServices, regionInfo, abort, zk,
EventType.M_RS_CLOSE_REGION);
}
protected CloseRegionHandler(final Server server,
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRootHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRootHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRootHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRootHandler.java
Tue Sep 21 21:44:21 2010
@@ -38,6 +38,6 @@ public class CloseRootHandler extends Cl
public CloseRootHandler(final Server server,
final RegionServerServices rsServices, HRegionInfo regionInfo,
final boolean abort, final boolean zk) {
- super(server, rsServices, regionInfo, abort, zk,
EventType.M2RS_CLOSE_ROOT);
+ super(server, rsServices, regionInfo, abort, zk,
EventType.M_RS_CLOSE_ROOT);
}
}
\ No newline at end of file
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
Tue Sep 21 21:44:21 2010
@@ -31,6 +31,6 @@ import org.apache.hadoop.hbase.regionser
public class OpenMetaHandler extends OpenRegionHandler {
public OpenMetaHandler(final Server server,
final RegionServerServices rsServices, HRegionInfo regionInfo) {
- super(server,rsServices, regionInfo, EventType.M2RS_OPEN_META);
+ super(server,rsServices, regionInfo, EventType.M_RS_OPEN_META);
}
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
Tue Sep 21 21:44:21 2010
@@ -48,7 +48,7 @@ public class OpenRegionHandler extends E
public OpenRegionHandler(final Server server,
final RegionServerServices rsServices, HRegionInfo regionInfo) {
- this(server, rsServices, regionInfo, EventType.M2RS_OPEN_REGION);
+ this(server, rsServices, regionInfo, EventType.M_RS_OPEN_REGION);
}
protected OpenRegionHandler(final Server server,
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
Tue Sep 21 21:44:21 2010
@@ -31,6 +31,6 @@ import org.apache.hadoop.hbase.regionser
public class OpenRootHandler extends OpenRegionHandler {
public OpenRootHandler(final Server server,
final RegionServerServices rsServices, HRegionInfo regionInfo) {
- super(server, rsServices, regionInfo, EventType.M2RS_OPEN_ROOT);
+ super(server, rsServices, regionInfo, EventType.M_RS_OPEN_ROOT);
}
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
Tue Sep 21 21:44:21 2010
@@ -1705,7 +1705,7 @@ public class HLog implements Syncable {
* @return Path to file into which to dump split log edits.
* @throws IOException
*/
- private static Path getRegionSplitEditsPath(final FileSystem fs,
+ static Path getRegionSplitEditsPath(final FileSystem fs,
final Entry logEntry, final Path rootDir)
throws IOException {
Path tableDir = HTableDescriptor.getTableDir(rootDir,
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
Tue Sep 21 21:44:21 2010
@@ -129,7 +129,7 @@ public class ZKAssign {
public static void createNodeOffline(ZooKeeperWatcher zkw, HRegionInfo
region,
String serverName)
throws KeeperException, KeeperException.NodeExistsException {
- createNodeOffline(zkw, region, serverName, EventType.M2ZK_REGION_OFFLINE);
+ createNodeOffline(zkw, region, serverName, EventType.M_ZK_REGION_OFFLINE);
}
public static void createNodeOffline(ZooKeeperWatcher zkw, HRegionInfo
region,
@@ -170,7 +170,7 @@ public class ZKAssign {
LOG.debug(zkw.prefix("Forcing existing unassigned node for " +
region.getEncodedName() + " to OFFLINE state"));
RegionTransitionData data = new RegionTransitionData(
- EventType.M2ZK_REGION_OFFLINE, region.getRegionName(), serverName);
+ EventType.M_ZK_REGION_OFFLINE, region.getRegionName(), serverName);
synchronized(zkw.getNodes()) {
String node = getNodeName(zkw, region.getEncodedName());
zkw.getNodes().add(node);
@@ -203,7 +203,7 @@ public class ZKAssign {
LOG.debug(zkw.prefix("Creating (or updating) unassigned node for " +
region.getEncodedName() + " with OFFLINE state"));
RegionTransitionData data = new RegionTransitionData(
- EventType.M2ZK_REGION_OFFLINE, region.getRegionName(), serverName);
+ EventType.M_ZK_REGION_OFFLINE, region.getRegionName(), serverName);
synchronized(zkw.getNodes()) {
String node = getNodeName(zkw, region.getEncodedName());
zkw.getNodes().add(node);
@@ -240,7 +240,7 @@ public class ZKAssign {
public static boolean deleteOpenedNode(ZooKeeperWatcher zkw,
String regionName)
throws KeeperException, KeeperException.NoNodeException {
- return deleteNode(zkw, regionName, EventType.RS2ZK_REGION_OPENED);
+ return deleteNode(zkw, regionName, EventType.RS_ZK_REGION_OPENED);
}
/**
@@ -266,7 +266,7 @@ public class ZKAssign {
public static boolean deleteClosedNode(ZooKeeperWatcher zkw,
String regionName)
throws KeeperException, KeeperException.NoNodeException {
- return deleteNode(zkw, regionName, EventType.RS2ZK_REGION_CLOSED);
+ return deleteNode(zkw, regionName, EventType.RS_ZK_REGION_CLOSED);
}
/**
@@ -292,7 +292,7 @@ public class ZKAssign {
public static boolean deleteClosingNode(ZooKeeperWatcher zkw,
String regionName)
throws KeeperException, KeeperException.NoNodeException {
- return deleteNode(zkw, regionName, EventType.RS2ZK_REGION_CLOSING);
+ return deleteNode(zkw, regionName, EventType.RS_ZK_REGION_CLOSING);
}
/**
@@ -395,7 +395,7 @@ public class ZKAssign {
LOG.debug(zkw.prefix("Creating unassigned node for " +
region.getEncodedName() + " in a CLOSING state"));
RegionTransitionData data = new RegionTransitionData(
- EventType.RS2ZK_REGION_CLOSING, region.getRegionName(), serverName);
+ EventType.RS_ZK_REGION_CLOSING, region.getRegionName(), serverName);
synchronized(zkw.getNodes()) {
String node = getNodeName(zkw, region.getEncodedName());
zkw.getNodes().add(node);
@@ -433,8 +433,8 @@ public class ZKAssign {
HRegionInfo region, String serverName, int expectedVersion)
throws KeeperException {
return transitionNode(zkw, region, serverName,
- EventType.RS2ZK_REGION_CLOSING,
- EventType.RS2ZK_REGION_CLOSED, expectedVersion);
+ EventType.RS_ZK_REGION_CLOSING,
+ EventType.RS_ZK_REGION_CLOSED, expectedVersion);
}
/**
@@ -467,14 +467,14 @@ public class ZKAssign {
HRegionInfo region, String serverName)
throws KeeperException {
return transitionNodeOpening(zkw, region, serverName,
- EventType.M2ZK_REGION_OFFLINE);
+ EventType.M_ZK_REGION_OFFLINE);
}
public static int transitionNodeOpening(ZooKeeperWatcher zkw,
HRegionInfo region, String serverName, final EventType beginState)
throws KeeperException {
return transitionNode(zkw, region, serverName, beginState,
- EventType.RS2ZK_REGION_OPENING, -1);
+ EventType.RS_ZK_REGION_OPENING, -1);
}
/**
@@ -507,8 +507,8 @@ public class ZKAssign {
HRegionInfo region, String serverName, int expectedVersion)
throws KeeperException {
return transitionNode(zkw, region, serverName,
- EventType.RS2ZK_REGION_OPENING,
- EventType.RS2ZK_REGION_OPENING, expectedVersion);
+ EventType.RS_ZK_REGION_OPENING,
+ EventType.RS_ZK_REGION_OPENING, expectedVersion);
}
/**
@@ -543,8 +543,8 @@ public class ZKAssign {
HRegionInfo region, String serverName, int expectedVersion)
throws KeeperException {
return transitionNode(zkw, region, serverName,
- EventType.RS2ZK_REGION_OPENING,
- EventType.RS2ZK_REGION_OPENED, expectedVersion);
+ EventType.RS_ZK_REGION_OPENING,
+ EventType.RS_ZK_REGION_OPENED, expectedVersion);
}
/**
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Tue
Sep 21 21:44:21 2010
@@ -217,7 +217,7 @@ public class TestAdmin {
MasterServices services = TEST_UTIL.getMiniHBaseCluster().getMaster();
ExecutorService executor = services.getExecutorService();
AtomicBoolean done = new AtomicBoolean(false);
- executor.registerListener(EventType.C2M_MODIFY_TABLE, new
DoneListener(done));
+ executor.registerListener(EventType.C_M_MODIFY_TABLE, new
DoneListener(done));
this.admin.modifyTable(tableName, htd);
while (!done.get()) {
synchronized (done) {
@@ -228,7 +228,7 @@ public class TestAdmin {
}
}
}
- executor.unregisterListener(EventType.C2M_MODIFY_TABLE);
+ executor.unregisterListener(EventType.C_M_MODIFY_TABLE);
}
/**
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
Tue Sep 21 21:44:21 2010
@@ -91,7 +91,7 @@ public class TestMaster {
CountDownLatch proceed = new CountDownLatch(1);
RegionOpenListener list = new RegionOpenListener(aboutToOpen, proceed);
cluster.getMaster().executorService.
- registerListener(EventType.RS2ZK_REGION_OPENED, list);
+ registerListener(EventType.RS_ZK_REGION_OPENED, list);
LOG.info("Splitting table");
admin.split(TABLENAME);
@@ -129,7 +129,7 @@ public class TestMaster {
@Override
public void afterProcess(EventHandler event) {
- if (event.getEventType() != EventType.RS2ZK_REGION_OPENED) {
+ if (event.getEventType() != EventType.RS_ZK_REGION_OPENED) {
return;
}
try {
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
Tue Sep 21 21:44:21 2010
@@ -78,7 +78,7 @@ public class TestRestartCluster {
HMaster.MASTER);
LOG.debug("Created UNASSIGNED zNode for ROOT and META regions in state " +
- EventType.M2ZK_REGION_OFFLINE);
+ EventType.M_ZK_REGION_OFFLINE);
// start the HB cluster
LOG.info("Starting HBase cluster...");
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
Tue Sep 21 21:44:21 2010
@@ -106,15 +106,15 @@ public class TestZKBasedOpenCloseRegion
EventHandlerListener closeListener =
new ReopenEventListener(hri.getRegionNameAsString(),
- closeEventProcessed, EventType.RS2ZK_REGION_CLOSED);
+ closeEventProcessed, EventType.RS_ZK_REGION_CLOSED);
cluster.getMaster().executorService.
- registerListener(EventType.RS2ZK_REGION_CLOSED, closeListener);
+ registerListener(EventType.RS_ZK_REGION_CLOSED, closeListener);
EventHandlerListener openListener =
new ReopenEventListener(hri.getRegionNameAsString(),
- reopenEventProcessed, EventType.RS2ZK_REGION_OPENED);
+ reopenEventProcessed, EventType.RS_ZK_REGION_OPENED);
cluster.getMaster().executorService.
- registerListener(EventType.RS2ZK_REGION_OPENED, openListener);
+ registerListener(EventType.RS_ZK_REGION_OPENED, openListener);
LOG.info("Unassign " + hri.getRegionNameAsString());
cluster.getMaster().assignmentManager.unassign(hri);
@@ -168,10 +168,10 @@ public class TestZKBasedOpenCloseRegion
if(event.getEventType() == eventType) {
LOG.info("Finished processing " + eventType);
String regionName = "";
- if(eventType == EventType.RS2ZK_REGION_OPENED) {
+ if(eventType == EventType.RS_ZK_REGION_OPENED) {
TotesHRegionInfo hriCarrier = (TotesHRegionInfo)event;
regionName = hriCarrier.getHRegionInfo().getRegionNameAsString();
- } else if(eventType == EventType.RS2ZK_REGION_CLOSED) {
+ } else if(eventType == EventType.RS_ZK_REGION_CLOSED) {
TotesHRegionInfo hriCarrier = (TotesHRegionInfo)event;
regionName = hriCarrier.getHRegionInfo().getRegionNameAsString();
}
@@ -200,7 +200,7 @@ public class TestZKBasedOpenCloseRegion
EventHandlerListener listener =
new CloseRegionEventListener(hri.getRegionNameAsString(),
closeEventProcessed);
-
cluster.getMaster().executorService.registerListener(EventType.RS2ZK_REGION_CLOSED,
listener);
+
cluster.getMaster().executorService.registerListener(EventType.RS_ZK_REGION_CLOSED,
listener);
cluster.getMaster().assignmentManager.unassign(hri);
@@ -224,7 +224,7 @@ public class TestZKBasedOpenCloseRegion
@Override
public void afterProcess(EventHandler event) {
LOG.info("afterProcess(" + event + ")");
- if(event.getEventType() == EventType.RS2ZK_REGION_CLOSED) {
+ if(event.getEventType() == EventType.RS_ZK_REGION_CLOSED) {
LOG.info("Finished processing CLOSE REGION");
TotesHRegionInfo hriCarrier = (TotesHRegionInfo)event;
if
(regionToClose.equals(hriCarrier.getHRegionInfo().getRegionNameAsString())) {
@@ -238,7 +238,7 @@ public class TestZKBasedOpenCloseRegion
@Override
public void beforeProcess(EventHandler event) {
- if(event.getEventType() == EventType.M2RS_CLOSE_REGION) {
+ if(event.getEventType() == EventType.M_RS_CLOSE_REGION) {
LOG.info("Received CLOSE RPC and beginning to process it");
}
}
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java?rev=999660&r1=999659&r2=999660&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
Tue Sep 21 21:44:21 2010
@@ -38,6 +38,7 @@ import org.apache.hadoop.fs.FileStatus;
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.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
@@ -129,6 +130,22 @@ public class TestHLogSplit {
public void tearDown() throws Exception {
}
+ /**
+ * @throws IOException
+ * @see https://issues.apache.org/jira/browse/HBASE-3020
+ */
+ @Test public void testRecoveredEditsPathForMeta() throws IOException {
+ FileSystem fs = FileSystem.get(TEST_UTIL.getConfiguration());
+ byte [] encoded =
HRegionInfo.FIRST_META_REGIONINFO.getEncodedNameAsBytes();
+ long now = System.currentTimeMillis();
+ HLog.Entry entry =
+ new HLog.Entry(new HLogKey(encoded, HConstants.META_TABLE_NAME, 1, now),
+ new WALEdit());
+ Path p = HLog.getRegionSplitEditsPath(fs, entry, new Path("/"));
+ assertEquals(p.getParent().getParent(),
+ HRegionInfo.FIRST_META_REGIONINFO.getEncodedName());
+ }
+
@Test(expected = IOException.class)
public void testSplitFailsIfNewHLogGetsCreatedAfterSplitStarted()
throws IOException {
