Github user revans2 commented on a diff in the pull request:
https://github.com/apache/storm/pull/1934#discussion_r100814219
--- Diff: storm-core/src/jvm/org/apache/storm/metric/cgroup/CGroupCpu.java
---
@@ -0,0 +1,68 @@
+/**
+ * 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.storm.metric.cgroup;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Report CPU used in the cgroup
+ */
+public class CGroupCpu extends CGroupMetricsBase<Map<String,Long>> {
+ long previousSystem = 0;
+ long previousUser = 0;
+
+ public CGroupCpu(Map<String, Object> conf) {
+ super(conf, "cpuacct.stat");
+ }
+
+ public int getUserHZ() {
+ return 100; // On most systems (x86) this is fine.
+ // If someone really does want full support
+ // we need to run `getconf CLK_TCK` and cache the result.
+ }
+
+ @Override
+ public Map<String, Long> parseFileContents(String contents) {
+ try {
+ long systemHz = 0;
+ long userHz = 0;
+ for (String line: contents.split("\n")) {
+ if (!line.isEmpty()) {
+ String [] parts = line.toLowerCase().split("\\s+");
+ if (parts[0].contains("system")) {
+ systemHz = Long.parseLong(parts[1].trim());
+ } else if (parts[0].contains("user")) {
+ userHz = Long.parseLong(parts[1].trim());
+ }
+ }
+ }
+ long user = userHz - previousUser;
+ long sys = systemHz - previousSystem;
+ previousUser = userHz;
+ previousSystem = systemHz;
+ long hz = getUserHZ();
+ HashMap<String, Long> ret = new HashMap<>();
+ ret.put("user-ms", user * 1000/hz); //Convert to millis
--- End diff --
I did this in part to match the
https://github.com/apache/storm/blob/master/external/storm-metrics/src/main/java/org/apache/storm/metrics/sigar/CPUMetric.java
format, which offers ms level metrics, not floating point, but just for the
JVM, not for the entire container.
I'll try to add documentation to explain the level of granularity that this
supports and some of it's limitations. I am missing documentation all together
after all.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
