You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2008/10/31 02:31:16 UTC
svn commit: r709320 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/client/HConnection.java
src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
src/java/org/apache/hadoop/hbase/client/HTable.java
Author: jdcryans
Date: Thu Oct 30 18:31:16 2008
New Revision: 709320
URL: http://svn.apache.org/viewvc?rev=709320&view=rev
Log:
HBASE-963 Fix the retries in HTable.flushCommit
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnection.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=709320&r1=709319&r2=709320&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Oct 30 18:31:16 2008
@@ -55,6 +55,7 @@
HBASE-971 Fix the failing tests on Hudson
HBASE-973 [doc] In getting started, make it clear that hbase needs to
create its directory in hdfs
+ HBASE-963 Fix the retries in HTable.flushCommit
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/HConnection.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnection.java?rev=709320&r1=709319&r2=709320&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnection.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnection.java Thu Oct 30 18:31:16 2008
@@ -20,11 +20,13 @@
package org.apache.hadoop.hbase.client;
import java.io.IOException;
+import java.util.ArrayList;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.MasterNotRunningException;
+import org.apache.hadoop.hbase.io.BatchUpdate;
import org.apache.hadoop.hbase.ipc.HMasterInterface;
import org.apache.hadoop.hbase.ipc.HRegionInterface;
@@ -150,4 +152,15 @@
*/
public <T> T getRegionServerForWithoutRetries(ServerCallable<T> callable)
throws IOException, RuntimeException;
+
+
+ /**
+ * Process a batch of rows. Currently it only works for updates until
+ * HBASE-880 is available. Does the retries.
+ * @param list A batch of rows to process
+ * @param tableName The name of the table
+ * @throws IOException
+ */
+ public void processBatchOfRows(ArrayList<BatchUpdate> list, byte[] tableName)
+ throws IOException;
}
\ No newline at end of file
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=709320&r1=709319&r2=709320&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java Thu Oct 30 18:31:16 2008
@@ -934,7 +934,7 @@
return i;
}
});
- if (index != updates.length - 1) {
+ if (index != -1) {
if (tries == numRetries - 1) {
throw new RetriesExhaustedException("Some server",
currentRegion, batchUpdate.getRow(),
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java?rev=709320&r1=709319&r2=709320&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java Thu Oct 30 18:31:16 2008
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -1029,60 +1028,20 @@
*/
public void flushCommits() throws IOException {
try {
- // See HBASE-748 for pseudo code of this method
- if (writeBuffer.isEmpty()) {
- return;
- }
- Collections.sort(writeBuffer);
- List<BatchUpdate> tempUpdates = new ArrayList<BatchUpdate>();
- byte[] currentRegion = connection.getRegionLocation(tableName,
- writeBuffer.get(0).getRow(), false).getRegionInfo().getRegionName();
- byte[] region = currentRegion;
- boolean isLastRow = false;
- for (int i = 0; i < writeBuffer.size(); i++) {
- BatchUpdate batchUpdate = writeBuffer.get(i);
- tempUpdates.add(batchUpdate);
- isLastRow = (i + 1) == writeBuffer.size();
- if (!isLastRow) {
- region = connection.getRegionLocation(tableName,
- writeBuffer.get(i + 1).getRow(), false).getRegionInfo()
- .getRegionName();
- }
- if (!Bytes.equals(currentRegion, region) || isLastRow) {
- final BatchUpdate[] updates = tempUpdates.toArray(new BatchUpdate[0]);
- int index = connection
- .getRegionServerForWithoutRetries(new ServerCallable<Integer>(
- connection, tableName, batchUpdate.getRow()) {
- public Integer call() throws IOException {
- int i = server.batchUpdates(location.getRegionInfo()
- .getRegionName(), updates);
- return i;
- }
- });
- if (index != -1) {
- // Basic waiting time. If many updates are flushed, tests have shown
- // that this is barely needed but when commiting 1 update this may
- // get retried hundreds of times.
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- // continue
- }
- i = i - updates.length + index;
- region = connection.getRegionLocation(tableName,
- writeBuffer.get(i + 1).getRow(), true).getRegionInfo()
- .getRegionName();
-
- }
- currentRegion = region;
- tempUpdates.clear();
- }
- }
+ connection.processBatchOfRows(writeBuffer, tableName);
} finally {
currentWriteBufferSize = 0;
writeBuffer.clear();
}
}
+
+ /**
+ * Release held resources
+ *
+ */
+ public void close() throws IOException{
+ flushCommits();
+ }
/**
* Utility method that checks rows existence, length and columns well