Skip to content

HADOOP-18364. All method metrics related to the RPC protocol should be initialized. #4624

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
Hexiaoqiao merged 4 commits into from
Aug 4, 2022
Merged

HADOOP-18364. All method metrics related to the RPC protocol should be initialized. #4624

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdefd97
HDFS-16683. All method metrics related to the rpc protocol should be …
zhangshuyan0 Jul 25, 2022
90286d6
Add a unit test and resolve conflicts.
zhangshuyan0 Jul 31, 2022
b79ea58
Move the unit test to TestNameNodeMetrics.
zhangshuyan0 Aug 2, 2022
448f038
Code style.
zhangshuyan0 Aug 3, 2022
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
2 changes: 1 addition & 1 deletion ...doop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRatesWithAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void init(Class<?> protocol) {
return;
}
protocolCache.add(protocol);
for (Method method : protocol.getDeclaredMethods()) {
for (Method method : protocol.getMethods()) {
String name = method.getName();
LOG.debug(name);
addMetricIfNotExists(name);
Expand Down
13 changes: 12 additions & 1 deletion ...hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;

import javax.management.AttributeNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;

Expand Down Expand Up @@ -591,14 +592,24 @@ public Boolean get() {
}

@Test
public void testNNRpcMetricsWithNonHA() throws IOException {
public void testNNRpcMetricsWithNonHA() throws Exception {
Configuration conf = new HdfsConfiguration();
// setting heartbeat interval to 1 hour to prevent bpServiceActor sends
// heartbeat periodically to NN during running test case, and bpServiceActor
// only sends heartbeat once after startup
conf.setTimeDuration(DFS_HEARTBEAT_INTERVAL_KEY, 1, TimeUnit.HOURS);
MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
cluster.waitActive();
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
Copy link
Contributor

@Hexiaoqiao Hexiaoqiao Aug 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zhangshuyan0 Thanks for your update. This unit test seems failed based on the yetus reports. Another side, this segment code located at TestNameNodeMetrics should be more proper? Thanks again.

Copy link
Contributor

@xkrogen xkrogen Aug 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed that this isn't the right place. Actually it seems like enhancing TestRPC#testRpcMetrics() might be the best place? Or if we can't get it to work there, then I agree TestNameNodeMetrics seems better.

final ObjectName mxbeanName =
new ObjectName("Hadoop:service=NameNode," +
"name=RpcDetailedActivityForPort" +
cluster.getNameNode().getNameNodeAddress().getPort());
try {
mbs.getAttribute(mxbeanName, "CommitBlockSynchronizationNumOps");
} catch (AttributeNotFoundException e) {
fail("Datanode protocol metrics have not been fully initialized.");
}
DataNode dn = cluster.getDataNodes().get(0);
MetricsRecordBuilder rb = getMetrics(dn.getMetrics().name());
assertCounter("HeartbeatsNumOps", 1L, rb);
Expand Down