Skip to content

HBASE-25586 Fix HBASE-22492 on branch-2 (SASL GapToken) #2961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meszibalu merged 1 commit into from
Feb 26, 2021
Merged

HBASE-25586 Fix HBASE-22492 on branch-2 (SASL GapToken) #2961

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,6 @@ public synchronized void setResponse(Message m, final CellScanner cells, Throwab
}
}
bc = new BufferChain(responseBufs);
if (connection.useWrap) {
bc = wrapWithSasl(bc);
}
} catch (IOException e) {
RpcServer.LOG.warn("Exception while creating response " + e);
}
Expand Down Expand Up @@ -547,6 +544,20 @@ public int getRemotePort() {

@Override
public synchronized BufferChain getResponse() {
return response;
if (connection.useWrap) {
/*
* wrapping result with SASL as the last step just before sending it out, so
* every message must have the right increasing sequence number
*/
try {
return wrapWithSasl(response);
} catch (IOException e) {
/* it is exactly the same what setResponse() does */
RpcServer.LOG.warn("Exception while creating response " + e);
return null;
}
} else {
return response;
}
}
}