-
Notifications
You must be signed in to change notification settings - Fork 9.2k
HDFS-16313. Add metrics for each subcluster #3638
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 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
96a8b6c
HDFS-16313. Add metrics for each subcluster
symious 4c3f4bc
HDFS-16313. Align the terminology
symious 849e80c
HDFS-16313. Fix checkstyle
symious c50092b
HDFS-16313. Use NameserviceRPCMetrics
symious d5232a2
HDFS-16313. Update to use nsId
symious 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
41 changes: 41 additions & 0 deletions
41
...bf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/SubClusterRPCMBean.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,41 @@ | ||
| /** | ||
| * 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.hdfs.server.federation.metrics; | ||
|
|
||
| import org.apache.hadoop.classification.InterfaceAudience; | ||
| import org.apache.hadoop.classification.InterfaceStability; | ||
|
|
||
| /** | ||
| * JMX interface for the RPC server of sub cluster. | ||
| * TODO use the default RPC MBean. | ||
| */ | ||
| @InterfaceAudience.Private | ||
| @InterfaceStability.Evolving | ||
| public interface SubClusterRPCMBean { | ||
|
|
||
| long getProxyOps(); | ||
|
|
||
| double getProxyAvg(); | ||
|
|
||
| long getProxyOpFailureCommunicate(); | ||
|
|
||
| long getProxyOpFailureStandby(); | ||
|
|
||
| long getProxyOpNoNamenodes(); | ||
|
|
||
| } | ||
121 changes: 121 additions & 0 deletions
121
.../src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/SubClusterRPCMetrics.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,121 @@ | ||
| /** | ||
| * 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.hdfs.server.federation.metrics; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hdfs.server.federation.router.RouterRpcServer; | ||
| import org.apache.hadoop.metrics2.MetricsSystem; | ||
| import org.apache.hadoop.metrics2.annotation.Metric; | ||
| import org.apache.hadoop.metrics2.annotation.Metrics; | ||
| import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; | ||
| import org.apache.hadoop.metrics2.lib.MetricsRegistry; | ||
| import org.apache.hadoop.metrics2.lib.MutableCounterLong; | ||
| import org.apache.hadoop.metrics2.lib.MutableRate; | ||
|
|
||
| import java.util.concurrent.ThreadLocalRandom; | ||
|
|
||
| /** | ||
| * Implementation of the RPC metrics collector. | ||
| */ | ||
| @Metrics(name = "SubClusterRPCActivity", about = "SubCluster RPC Activity", | ||
| context = "dfs") | ||
| public class SubClusterRPCMetrics implements SubClusterRPCMBean { | ||
|
|
||
| private final MetricsRegistry registry = new MetricsRegistry("router"); | ||
|
|
||
| public final static String SUB_CLUSTER_RPC_METRICS_PREFIX = "SubClusterActivity-"; | ||
|
|
||
| private String name; | ||
| private RouterRpcServer rpcServer; | ||
|
|
||
| @Metric("Time for the Router to proxy an operation to the Nameservice") | ||
| private MutableRate proxy; | ||
| @Metric("Number of operations the Router proxied to a Nameservice") | ||
| private MutableCounterLong proxyOp; | ||
|
|
||
| @Metric("Number of operations to hit a standby NN") | ||
| private MutableCounterLong proxyOpFailureStandby; | ||
| @Metric("Number of operations to fail to reach NN") | ||
| private MutableCounterLong proxyOpFailureCommunicate; | ||
| @Metric("Number of operations to hit no namenodes available") | ||
| private MutableCounterLong proxyOpNoNamenodes; | ||
|
|
||
| public SubClusterRPCMetrics(Configuration conf, String name, | ||
| RouterRpcServer rpcServer) { | ||
| this.name = name; | ||
| this.rpcServer = rpcServer; | ||
| } | ||
|
|
||
| public static SubClusterRPCMetrics create(Configuration conf, | ||
| String subClusterName, RouterRpcServer rpcServer) { | ||
| MetricsSystem ms = DefaultMetricsSystem.instance(); | ||
| String name = SUB_CLUSTER_RPC_METRICS_PREFIX + (subClusterName.isEmpty() | ||
| ? "UndefinedSubClusterName"+ ThreadLocalRandom.current().nextInt() | ||
| : subClusterName); | ||
| return ms.register(name, "HDFS Federation SubCluster RPC Metrics", | ||
| new SubClusterRPCMetrics(conf, name, rpcServer)); | ||
| } | ||
|
|
||
| public void incrProxyOpFailureStandby() { | ||
| proxyOpFailureStandby.incr(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getProxyOpFailureStandby() { | ||
| return proxyOpFailureStandby.value(); | ||
| } | ||
|
|
||
| public void incrProxyOpFailureCommunicate() { | ||
| proxyOpFailureCommunicate.incr(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getProxyOpFailureCommunicate() { | ||
| return proxyOpFailureCommunicate.value(); | ||
| } | ||
|
|
||
| public void incrProxyOpNoNamenodes() { | ||
| proxyOpNoNamenodes.incr(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getProxyOpNoNamenodes() { | ||
| return proxyOpNoNamenodes.value(); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Add the time to proxy an operation from the moment the Router sends it to | ||
| * the Namenode until it replied. | ||
| * @param time Proxy time of an operation in nanoseconds. | ||
| */ | ||
| public void addProxyTime(long time) { | ||
| proxy.add(time); | ||
| proxyOp.incr(); | ||
| } | ||
|
|
||
| @Override | ||
| public double getProxyAvg() { | ||
| return proxy.lastStat().mean(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getProxyOps() { | ||
| return proxyOp.value(); | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,18 +62,18 @@ void init( | |
| * Mark a proxy operation as completed. | ||
| * @param success If the operation was successful. | ||
| */ | ||
| void proxyOpComplete(boolean success); | ||
| void proxyOpComplete(boolean success, String ns); | ||
|
||
|
|
||
| /** | ||
| * Failed to proxy an operation to a Namenode because it was in standby. | ||
| */ | ||
| void proxyOpFailureStandby(); | ||
| void proxyOpFailureStandby(String ns); | ||
|
|
||
| /** | ||
| * Failed to proxy an operation to a Namenode because of an unexpected | ||
| * exception. | ||
| */ | ||
| void proxyOpFailureCommunicate(); | ||
| void proxyOpFailureCommunicate(String ns); | ||
|
|
||
| /** | ||
| * Failed to proxy an operation to a Namenode because the client was | ||
|
|
@@ -95,7 +95,7 @@ void init( | |
| /** | ||
| * Failed to proxy an operation because of no namenodes available. | ||
| */ | ||
| void proxyOpNoNamenodes(); | ||
| void proxyOpNoNamenodes(String ns); | ||
|
|
||
| /** | ||
| * If the Router cannot contact the State Store in an operation. | ||
|
|
||
Oops, something went wrong.
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 am not sure if we are consistent with terminology.
Sometimes we use subcluster at a high level but then throughout the code we refer to it as namespace.
Can you check what is the most consistent terminology throughout?
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.
Sure. Aligned to use "subcluster".