HBASE-8259 Snapshot backport in 0.94.6 breaks rolling restarts (J-D) + CHANGES.txt and pom.xml
git-svn-id: https://svn.apache.org/repos/asf/hbase/tags/0.94.6.1@1464658 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 7f105ca..24780df 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,10 @@
HBase Change Log
+Release 0.94.6.1 - 4/4/2013
+Bug
+
+ [HBASE-8259] - Snapshot backport in 0.94.6 breaks rolling restarts
+
Release 0.94.6 - 3/14/2013
Sub-task
diff --git a/pom.xml b/pom.xml
index 6fe7bd6..35ffe67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<packaging>jar</packaging>
- <version>0.94.6</version>
+ <version>0.94.6.1</version>
<name>HBase</name>
<description>
HBase is the &lt;a href="http://hadoop.apache.org"&rt;Hadoop</a&rt; database. Use it when you need
diff --git a/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java b/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
index 1be8a0f..46dafe0 100644
--- a/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
+++ b/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
@@ -95,10 +95,10 @@
* originated and then where its destined -- e.g. RS2ZK_ prefix means the
* event came from a regionserver destined for zookeeper -- and then what
* the even is; e.g. REGION_OPENING.
- *
- * <p>We give the enums indices so we can add types later and keep them
- * grouped together rather than have to add them always to the end as we
- * would have to if we used raw enum ordinals.
+ *
+ * <p>WARNING: Please do not insert, remove or swap any line in this enum
+ * Doing so would change or shift all the codes used to serialize
+ * events, which makes backwards compatibility very hard for clients.
*/
public enum EventType {
// Messages originating from RS (NOTE: there is NO direct communication from
@@ -128,8 +128,6 @@
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
C_M_CREATE_TABLE (47), // Client asking Master to create a table
- C_M_SNAPSHOT_TABLE (48), // Client asking Master to snapshot an offline table
- C_M_RESTORE_SNAPSHOT (49), // Client asking Master to snapshot an offline table
// Updates from master to ZK. This is done by the master and there is
// nothing to process by either Master or RS
@@ -138,7 +136,13 @@
// Master controlled events to be executed on the master
M_SERVER_SHUTDOWN (70), // Master is processing shutdown of a RS
- M_META_SERVER_SHUTDOWN (72); // Master is processing shutdown of RS hosting a meta region (-ROOT- or .META.).
+ M_META_SERVER_SHUTDOWN (72), // Master is processing shutdown of RS hosting a meta region (-ROOT- or .META.).
+
+ // WARNING: Please do not insert, remove or swap any line in this enum.
+ // RegionTransitionData.write() uses eventType.ordinal() that is the enum index
+ // and not the value specified in the enum definition. so we can't add stuff in the middle.
+ C_M_SNAPSHOT_TABLE (48), // Client asking Master to snapshot an offline table
+ C_M_RESTORE_SNAPSHOT (49); // Client asking Master to snapshot an offline table
/**
* Constructor