Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10519 Add handling for swallowed InterruptedException thrown by Thread.sleep in rest related files (Feng Honghua) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1570217 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nkeywal 2014-02-20 15:10:03 +00:00
parent 2476afbcb2
commit 65fa5c4d82
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
View File

@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.rest.client;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InterruptedIOException;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
@ -130,6 +131,7 @@ public class RemoteAdmin {
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
} }
break; break;
default: default:
@ -171,6 +173,7 @@ public class RemoteAdmin {
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
} }
break; break;
default: default:
@ -219,6 +222,7 @@ public class RemoteAdmin {
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
} }
break; break;
default: default:
@ -256,7 +260,9 @@ public class RemoteAdmin {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("get request to " + path.toString() + " returned " + code); throw new IOException("get request to " + path.toString() + " returned " + code);
@ -293,7 +299,9 @@ public class RemoteAdmin {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("create request to " + path.toString() + " returned " + code); throw new IOException("create request to " + path.toString() + " returned " + code);
@ -336,7 +344,9 @@ public class RemoteAdmin {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("delete request to " + path.toString() + " returned " + code); throw new IOException("delete request to " + path.toString() + " returned " + code);
@ -377,6 +387,7 @@ public class RemoteAdmin {
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
} }
break; break;
default: default:

31
hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
View File

@ -20,6 +20,7 @@
package org.apache.hadoop.hbase.rest.client; package org.apache.hadoop.hbase.rest.client;
import java.io.IOException; import java.io.IOException;
import java.io.InterruptedIOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
@ -268,7 +269,9 @@ public class RemoteHTable implements HTableInterface {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("schema request returned " + code); throw new IOException("schema request returned " + code);
@ -344,7 +347,9 @@ public class RemoteHTable implements HTableInterface {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("get request returned " + code); throw new IOException("get request returned " + code);
@ -389,7 +394,9 @@ public class RemoteHTable implements HTableInterface {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("put request failed with " + code); throw new IOException("put request failed with " + code);
@ -443,7 +450,9 @@ public class RemoteHTable implements HTableInterface {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("multiput request failed with " + code); throw new IOException("multiput request failed with " + code);
@ -464,7 +473,9 @@ public class RemoteHTable implements HTableInterface {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("delete request failed with " + code); throw new IOException("delete request failed with " + code);
@ -510,7 +521,9 @@ public class RemoteHTable implements HTableInterface {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("scan request failed with " + code); throw new IOException("scan request failed with " + code);
@ -539,7 +552,9 @@ public class RemoteHTable implements HTableInterface {
case 509: case 509:
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (InterruptedException e) { } } catch (InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
}
break; break;
default: default:
throw new IOException("scanner.next request failed with " + code); throw new IOException("scanner.next request failed with " + code);
@ -660,6 +675,7 @@ public class RemoteHTable implements HTableInterface {
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (final InterruptedException e) { } catch (final InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
} }
break; break;
default: default:
@ -700,6 +716,7 @@ public class RemoteHTable implements HTableInterface {
try { try {
Thread.sleep(sleepTime); Thread.sleep(sleepTime);
} catch (final InterruptedException e) { } catch (final InterruptedException e) {
throw (InterruptedIOException)new InterruptedIOException().initCause(e);
} }
break; break;
default: default: