You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2009/05/22 04:19:40 UTC
svn commit: r777352 - in /hadoop/hbase/trunk_on_hadoop-0.18.3: ./ bin/ lib/
src/java/org/apache/hadoop/hbase/
src/java/org/apache/hadoop/hbase/regionserver/
Author: apurtell
Date: Fri May 22 02:19:40 2009
New Revision: 777352
URL: http://svn.apache.org/viewvc?rev=777352&view=rev
Log:
HBASE-1257, HBASE-1436, HBASE-1272, HBASE-1395
Added:
hadoop/hbase/trunk_on_hadoop-0.18.3/lib/AgileJSON-2009-03-30.jar (with props)
hadoop/hbase/trunk_on_hadoop-0.18.3/lib/json.jar (with props)
Removed:
hadoop/hbase/trunk_on_hadoop-0.18.3/lib/AgileJSON-2.0.jar
Modified:
hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt
hadoop/hbase/trunk_on_hadoop-0.18.3/NOTICE.txt
hadoop/hbase/trunk_on_hadoop-0.18.3/bin/hbase
hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/HServerInfo.java
hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/Store.java
Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt?rev=777352&r1=777351&r2=777352&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt (original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt Fri May 22 02:19:40 2009
@@ -147,6 +147,13 @@
HBASE-1162 CME in Master in RegionManager.applyActions
HBASE-1010 IOE on regionserver shutdown because hadn't opened an HLog
HBASE-1415 Stuck on memcache flush
+ HBASE-1257 base64 encoded values are not contained in quotes during the
+ HBase REST JSON serialization (Brian Beggs via Stack)
+ HBASE-1436 Killing regionserver can make corrupted hfile
+ HBASE-1272 Unreadable log messages -- "... to the only server
+ localhost_1237525439599_56094" <- You'd have to be perverse
+ to recognize that as a hostname, startcode, and port
+ HBASE-1395 InfoServers no longer put up a UI
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/NOTICE.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/NOTICE.txt?rev=777352&r1=777351&r2=777352&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/NOTICE.txt (original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/NOTICE.txt Fri May 22 02:19:40 2009
@@ -12,6 +12,7 @@
JUnit (http://www.junit.org/)
+The JSON jar source is here: http://www.json.org/java/index.html
Michael Gottesman developed AgileJSON. Its source code is here:
Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/bin/hbase
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/bin/hbase?rev=777352&r1=777351&r2=777352&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/bin/hbase (original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/bin/hbase Fri May 22 02:19:40 2009
@@ -118,15 +118,16 @@
CLASSPATH=${CLASSPATH}:$HBASE_HOME/build
fi
-# for releases, add hbase & webapps to CLASSPATH
+# For releases, add hbase & webapps to CLASSPATH
+# Webapps must come first else it messes up Jetty
+if [ -d "$HBASE_HOME/webapps" ]; then
+ CLASSPATH=${CLASSPATH}:$HBASE_HOME
+fi
for f in $HBASE_HOME/hbase*.jar; do
if [ -f $f ]; then
CLASSPATH=${CLASSPATH}:$f;
fi
done
-if [ -d "$HBASE_HOME/webapps" ]; then
- CLASSPATH=${CLASSPATH}:$HBASE_HOME
-fi
# Add libs to CLASSPATH
for f in $HBASE_HOME/lib/*.jar; do
Added: hadoop/hbase/trunk_on_hadoop-0.18.3/lib/AgileJSON-2009-03-30.jar
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/lib/AgileJSON-2009-03-30.jar?rev=777352&view=auto
==============================================================================
Binary file - no diff available.
Propchange: hadoop/hbase/trunk_on_hadoop-0.18.3/lib/AgileJSON-2009-03-30.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: hadoop/hbase/trunk_on_hadoop-0.18.3/lib/json.jar
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/lib/json.jar?rev=777352&view=auto
==============================================================================
Binary file - no diff available.
Propchange: hadoop/hbase/trunk_on_hadoop-0.18.3/lib/json.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/HServerInfo.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/HServerInfo.java?rev=777352&r1=777351&r2=777352&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/HServerInfo.java (original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/HServerInfo.java Fri May 22 02:19:40 2009
@@ -245,10 +245,10 @@
private static String getServerName(String hostName, int port, long startCode) {
StringBuilder name = new StringBuilder(hostName);
- name.append("_");
- name.append(startCode);
- name.append("_");
+ name.append(",");
name.append(port);
+ name.append(",");
+ name.append(startCode);
return name.toString();
}
}
Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=777352&r1=777351&r2=777352&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/Store.java Fri May 22 02:19:40 2009
@@ -356,7 +356,15 @@
LOG.warn("Skipping " + p + " because its empty. HBASE-646 DATA LOSS?");
continue;
}
- StoreFile curfile = new StoreFile(fs, p);
+ StoreFile curfile = null;
+ try {
+ curfile = new StoreFile(fs, p);
+ } catch (IOException ioe) {
+ LOG.warn("Failed open of " + p + "; presumption is that file was " +
+ "corrupted at flush and lost edits picked up by commit log replay. " +
+ "Verify!", ioe);
+ continue;
+ }
long storeSeqId = curfile.getMaxSequenceId();
if (storeSeqId > this.maxSeqId) {
this.maxSeqId = storeSeqId;