-
Notifications
You must be signed in to change notification settings - Fork 3.4k
HBASE-28175: Deep copy RpcLogDetails' param field #5481
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
265 changes: 265 additions & 0 deletions
265
hbase-server/src/test/java/org/apache/hadoop/hbase/namequeues/TestRpcLogDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,265 @@ | ||
/* | ||
* 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.namequeues; | ||
|
||
import static org.junit.Assert.assertArrayEquals; | ||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertFalse; | ||
|
||
import java.io.IOException; | ||
import java.net.InetAddress; | ||
import java.nio.ByteBuffer; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.Map; | ||
import java.util.Optional; | ||
import org.apache.hadoop.hbase.CellScanner; | ||
import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
import org.apache.hadoop.hbase.ipc.RpcCall; | ||
import org.apache.hadoop.hbase.ipc.RpcCallback; | ||
import org.apache.hadoop.hbase.security.User; | ||
import org.apache.hadoop.hbase.testclassification.RegionServerTests; | ||
import org.apache.hadoop.hbase.testclassification.SmallTests; | ||
import org.apache.hadoop.hbase.util.Bytes; | ||
import org.junit.ClassRule; | ||
import org.junit.Test; | ||
import org.junit.experimental.categories.Category; | ||
|
||
import org.apache.hbase.thirdparty.com.google.protobuf.BlockingService; | ||
import org.apache.hbase.thirdparty.com.google.protobuf.ByteString; | ||
import org.apache.hbase.thirdparty.com.google.protobuf.CodedInputStream; | ||
import org.apache.hbase.thirdparty.com.google.protobuf.Descriptors; | ||
import org.apache.hbase.thirdparty.com.google.protobuf.Message; | ||
import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations; | ||
|
||
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; | ||
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos; | ||
import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; | ||
import org.apache.hadoop.hbase.shaded.protobuf.generated.RPCProtos; | ||
|
||
@Category({ RegionServerTests.class, SmallTests.class }) | ||
public class TestRpcLogDetails { | ||
|
||
@ClassRule | ||
public static final HBaseClassTestRule CLASS_RULE = | ||
HBaseClassTestRule.forClass(TestRpcLogDetails.class); | ||
|
||
private final ClientProtos.Scan scan = | ||
ClientProtos.Scan.newBuilder().setStartRow(ByteString.copyFrom(Bytes.toBytes("abc"))) | ||
.setStopRow(ByteString.copyFrom(Bytes.toBytes("xyz"))).build(); | ||
private final ClientProtos.Scan otherScan = | ||
ClientProtos.Scan.newBuilder().setStartRow(ByteString.copyFrom(Bytes.toBytes("def"))) | ||
.setStopRow(ByteString.copyFrom(Bytes.toBytes("uvw"))).build(); | ||
private final ClientProtos.ScanRequest scanRequest = ClientProtos.ScanRequest | ||
.newBuilder(ClientProtos.ScanRequest.getDefaultInstance()).setScan(scan).build(); | ||
private final ClientProtos.ScanRequest otherScanRequest = ClientProtos.ScanRequest | ||
.newBuilder(ClientProtos.ScanRequest.getDefaultInstance()).setScan(otherScan).build(); | ||
|
||
@Test | ||
public void itDeepCopiesRpcLogDetailsParams() throws IOException { | ||
ByteBuffer buffer = ByteBuffer.allocate(scanRequest.toByteArray().length); | ||
CodedInputStream cis = UnsafeByteOperations.unsafeWrap(buffer).newCodedInput(); | ||
cis.enableAliasing(true); | ||
buffer.put(scanRequest.toByteArray()); | ||
Message.Builder messageBuilder = ClientProtos.ScanRequest.newBuilder(); | ||
ProtobufUtil.mergeFrom(messageBuilder, cis, buffer.capacity()); | ||
Message message = messageBuilder.build(); | ||
RpcLogDetails rpcLogDetails = | ||
new RpcLogDetails(getRpcCall(message), message, null, 0L, 0L, null, true, false); | ||
|
||
// log's scan should be equal | ||
ClientProtos.Scan logScan = ((ClientProtos.ScanRequest) rpcLogDetails.getParam()).getScan(); | ||
assertEquals(logScan, scan); | ||
|
||
// ensure we have a different byte array for testing | ||
assertFalse(Arrays.equals(scanRequest.toByteArray(), otherScanRequest.toByteArray())); | ||
|
||
// corrupt the underlying buffer | ||
buffer.position(0); | ||
buffer.put(otherScanRequest.toByteArray(), 0, otherScanRequest.toByteArray().length); | ||
assertArrayEquals(otherScanRequest.toByteArray(), buffer.array()); | ||
|
||
// log scan should still be original scan | ||
assertEquals(logScan, scan); | ||
} | ||
Comment on lines
+73
to
+99
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test fails without this PR's changes to RpcLogDetails |
||
|
||
@SuppressWarnings("checkstyle:methodlength") | ||
private static RpcCall getRpcCall(Message message) { | ||
RpcCall rpcCall = new RpcCall() { | ||
@Override | ||
public BlockingService getService() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public Descriptors.MethodDescriptor getMethod() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public Message getParam() { | ||
return message; | ||
} | ||
|
||
@Override | ||
public CellScanner getCellScanner() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public long getReceiveTime() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public long getStartTime() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public void setStartTime(long startTime) { | ||
} | ||
|
||
@Override | ||
public int getTimeout() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public int getPriority() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public long getDeadline() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public long getSize() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public RPCProtos.RequestHeader getHeader() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public Map<String, byte[]> getConnectionAttributes() { | ||
return Collections.emptyMap(); | ||
} | ||
|
||
@Override | ||
public Map<String, byte[]> getRequestAttributes() { | ||
return Collections.emptyMap(); | ||
} | ||
|
||
@Override | ||
public byte[] getRequestAttribute(String key) { | ||
return null; | ||
} | ||
|
||
@Override | ||
public int getRemotePort() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public void setResponse(Message param, CellScanner cells, Throwable errorThrowable, | ||
String error) { | ||
} | ||
|
||
@Override | ||
public void sendResponseIfReady() throws IOException { | ||
} | ||
|
||
@Override | ||
public void cleanup() { | ||
} | ||
|
||
@Override | ||
public String toShortString() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public long disconnectSince() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public boolean isClientCellBlockSupported() { | ||
return false; | ||
} | ||
|
||
@Override | ||
public Optional<User> getRequestUser() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public InetAddress getRemoteAddress() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public HBaseProtos.VersionInfo getClientVersionInfo() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public void setCallBack(RpcCallback callback) { | ||
} | ||
|
||
@Override | ||
public boolean isRetryImmediatelySupported() { | ||
return false; | ||
} | ||
|
||
@Override | ||
public long getResponseCellSize() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public void incrementResponseCellSize(long cellSize) { | ||
} | ||
|
||
@Override | ||
public long getBlockBytesScanned() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public void incrementBlockBytesScanned(long blockSize) { | ||
} | ||
|
||
@Override | ||
public long getResponseExceptionSize() { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public void incrementResponseExceptionSize(long exceptionSize) { | ||
} | ||
}; | ||
return rpcCall; | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also noticed this bug in the SlowLogParams equals implementation, but I don't think it's related to the slow log payload corruption that we've observed