hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r704642 - in /hadoop/hbase: branches/0.18/ branches/0.18/src/java/org/apache/hadoop/hbase/client/ branches/0.18/src/java/org/apache/hadoop/hbase/regionserver/ trunk/ trunk/src/java/org/apache/hadoop/hbase/client/
Date Tue, 14 Oct 2008 19:45:29 GMT
Author: stack
Date: Tue Oct 14 12:45:29 2008
New Revision: 704642

URL: http://svn.apache.org/viewvc?rev=704642&view=rev
Log:
HBASE-926 NPE throwing RetriesExhaustedException

Modified:
    hadoop/hbase/branches/0.18/CHANGES.txt
    hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
    hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerCallable.java

Modified: hadoop/hbase/branches/0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.18/CHANGES.txt?rev=704642&r1=704641&r2=704642&view=diff
==============================================================================
--- hadoop/hbase/branches/0.18/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.18/CHANGES.txt Tue Oct 14 12:45:29 2008
@@ -9,6 +9,8 @@
    HBASE-918   Region balancing during startup makes cluster unstable
    HBASE-921   region close and open processed out of order; makes for 
                disagreement between master and regionserver on region state
+   HBASE-925   HRS NPE on way out if no master to connect to
+   HBASE-928   NPE throwing RetriesExhaustedException
 
 Release 0.18.0 - September 21st, 2008
 

Modified: hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=704642&r1=704641&r2=704642&view=diff
==============================================================================
--- hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
(original)
+++ hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
Tue Oct 14 12:45:29 2008
@@ -68,9 +68,6 @@
   
   /** @return the region name */
   public byte[] getRegionName() {
-    if (location == null) {
-      return null;
-    }
     return location.getRegionInfo().getRegionName();
   }
   

Modified: hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=704642&r1=704641&r2=704642&view=diff
==============================================================================
--- hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++ hadoop/hbase/branches/0.18/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Tue Oct 14 12:45:29 2008
@@ -446,8 +446,10 @@
       if (this.fsOk) {
         // Only try to clean up if the file system is available
         try {
-          this.log.close();
-          LOG.info("On abort, closed hlog");
+          if (this.log != null) {
+            this.log.close();
+            LOG.info("On abort, closed hlog");
+          }
         } catch (IOException e) {
           LOG.error("Unable to close log in abort",
               RemoteExceptionHandler.checkIOException(e));

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=704642&r1=704641&r2=704642&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Oct 14 12:45:29 2008
@@ -24,6 +24,7 @@
    HBASE-921   region close and open processed out of order; makes for 
                disagreement between master and regionserver on region state
    HBASE-925   HRS NPE on way out if no master to connect to
+   HBASE-928   NPE throwing RetriesExhaustedException
 
   IMPROVEMENTS
    HBASE-901   Add a limit to key length, check key and value length on client side

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=704642&r1=704641&r2=704642&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerCallable.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerCallable.java Tue Oct
14 12:45:29 2008
@@ -68,9 +68,6 @@
   
   /** @return the region name */
   public byte[] getRegionName() {
-    if (location == null) {
-      return null;
-    }
     return location.getRegionInfo().getRegionName();
   }
   



Mime
View raw message