hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject svn commit: r1301880 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Date Sat, 17 Mar 2012 07:28:14 GMT
Author: jmhsieh
Date: Sat Mar 17 07:28:13 2012
New Revision: 1301880

URL: http://svn.apache.org/viewvc?rev=1301880&view=rev
Log:
HBASE-5588 Deprecate/remove AssignmentManager#clearRegionFromTransition

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1301880&r1=1301879&r2=1301880&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Sat Mar 17 07:28:13 2012
@@ -4,6 +4,9 @@ Release 0.90.7 - Unreleased
   BUG FIXES
    HBASE-5568  Multi concurrent flushcache() for one region could cause data loss (Chunhui)
 
+  IMPROVEMENT
+   HBASE-5588 Deprecate/remove AssignmentManager#clearRegionFromTransition
+
 Release 0.90.6 - March 16, 2012
   INCOMPATIBLE CHANGES
    HBASE-5228  [REST] Rip out "transform" feature

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1301880&r1=1301879&r2=1301880&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Sat Mar 17 07:28:13 2012
@@ -122,7 +122,7 @@ public class AssignmentManager extends Z
    * Server to regions assignment map.
    * Contains the set of regions currently assigned to a given server.
    * This Map and {@link #regions} are tied.  Always update this in tandem
-   * with the other under a lock on {@link #regions}
+   * with the other under a lock on {@link #regions}.
    * @see #regions
    */
   private final NavigableMap<HServerInfo, Set<HRegionInfo>> servers =
@@ -132,7 +132,7 @@ public class AssignmentManager extends Z
    * Region to server assignment map.
    * Contains the server a given region is currently assigned to.
    * This Map and {@link #servers} are tied.  Always update this in tandem
-   * with the other under a lock on {@link #regions}
+   * with the other under a lock on {@link #regions}.
    * @see #servers
    */
   private final SortedMap<HRegionInfo,HServerInfo> regions =
@@ -1843,8 +1843,9 @@ public class AssignmentManager extends Z
   /**
    * Clears the specified region from being in transition.
    * <p>
-   * Used only by HBCK tool.
-   * @param hri
+   * @param hri Region to remove.
+   * @deprecated This is a dupe of {@link #regionOffline(HRegionInfo)}.
+   *   Please use that method instead.
    */
   public void clearRegionFromTransition(HRegionInfo hri) {
     synchronized (this.regionsInTransition) {

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1301880&r1=1301879&r2=1301880&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Sat Mar
17 07:28:13 2012
@@ -960,7 +960,7 @@ implements HMasterInterface, HMasterRegi
 
   public void clearFromTransition(HRegionInfo hri) {
     if (this.assignmentManager.isRegionInTransition(hri) != null) {
-      this.assignmentManager.clearRegionFromTransition(hri);
+      this.assignmentManager.regionOffline(hri);
     }
   }
   /**
@@ -1079,7 +1079,7 @@ implements HMasterInterface, HMasterRegi
     if (pair == null) throw new UnknownRegionException(Bytes.toStringBinary(regionName));
     HRegionInfo hri = pair.getFirst();
     if (force) {
-      this.assignmentManager.clearRegionFromTransition(hri);
+      this.assignmentManager.regionOffline(hri);
       assignRegion(hri);
     } else {
       this.assignmentManager.unassign(hri, force);



Mime
View raw message