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

HBASE-26875 RpcRetryingCallerImpl translateException ignores return value of recursive call (#4270)

Browse Source 
Signed-off-by: Andrew Purtell <apurtell@apache.org>
This commit is contained in:
Bryan Beaudreault 2022-03-25 12:05:12 -04:00 committed by Andrew Purtell
parent 1404539731
commit c41c18bb8d
2 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
View File

@ -224,13 +224,12 @@ public class RpcRetryingCallerImpl<T> implements RpcRetryingCaller<T> {
if (t instanceof ServiceException) { if (t instanceof ServiceException) {
ServiceException se = (ServiceException)t; ServiceException se = (ServiceException)t;
Throwable cause = se.getCause(); Throwable cause = se.getCause();
if (cause != null && cause instanceof DoNotRetryIOException) { if (cause instanceof DoNotRetryIOException) {
throw (DoNotRetryIOException)cause; throw (DoNotRetryIOException)cause;
} }
// Don't let ServiceException out; its rpc specific. // Don't let ServiceException out; its rpc specific.
t = cause; // It also could be a RemoteException, so go around again.
// t could be a RemoteException so go around again. t = translateException(cause);
translateException(t);
} else if (t instanceof DoNotRetryIOException) { } else if (t instanceof DoNotRetryIOException) {
throw (DoNotRetryIOException)t; throw (DoNotRetryIOException)t;
} }

50
hbase-client/src/test/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImplTest.java Normal file
View File

@ -0,0 +1,50 @@
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package org.apache.hadoop.hbase.client;
import org.apache.hadoop.hbase.CallDroppedException;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.ipc.RemoteWithExtrasException;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
@Category({ ClientTests.class, SmallTests.class})
public class RpcRetryingCallerImplTest {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(RpcRetryingCallerImplTest.class);
@Test
public void itTranslatesRemoteExceptionFromServiceException() throws DoNotRetryIOException {
String message = "CDE for test";
ServiceException exception = new ServiceException(
new RemoteWithExtrasException(CallDroppedException.class.getName(), message, false));
Throwable result = RpcRetryingCallerImpl.translateException(exception);
Assert.assertTrue("Expect unwrap CallDroppedException",
result instanceof CallDroppedException);
Assert.assertEquals(message, result.getMessage());
}
}