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 2014/09/23 02:37:45 UTC
[9/9] git commit: HBASE-12044 REST delete operation should not retry
disableTable for DoNotRetryIOException (Aditya Kishore)
HBASE-12044 REST delete operation should not retry disableTable for DoNotRetryIOException (Aditya Kishore)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0153a353
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0153a353
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0153a353
Branch: refs/heads/master
Commit: 0153a353b2e6fcfa62cc7c3b31876c3aaa6d89d4
Parents: e925348
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Sep 22 17:37:19 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Sep 22 17:37:19 2014 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/rest/SchemaResource.java | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0153a353/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java
index f85ddac..2f1fc2a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java
@@ -42,6 +42,7 @@ import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableExistsException;
import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.TableNotEnabledException;
import org.apache.hadoop.hbase.TableNotFoundException;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.Table;
@@ -231,16 +232,9 @@ public class SchemaResource extends ResourceBase {
}
try {
HBaseAdmin admin = servlet.getAdmin();
- boolean success = false;
- for (int i = 0; i < 10; i++) try {
+ try {
admin.disableTable(tableResource.getName());
- success = true;
- break;
- } catch (IOException e) {
- }
- if (!success) {
- throw new IOException("could not disable table");
- }
+ } catch (TableNotEnabledException e) { /* this is what we want anyway */ }
admin.deleteTable(tableResource.getName());
servlet.getMetrics().incrementSucessfulDeleteRequests(1);
return Response.ok().build();