Github user revans2 commented on a diff in the pull request:
https://github.com/apache/storm/pull/1934#discussion_r102484535
--- Diff: storm-core/src/jvm/org/apache/storm/metric/cgroup/CGroupCpu.java
---
@@ -0,0 +1,70 @@
+/**
+ * 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.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.storm.container.cgroup.SubSystemType;
+import org.apache.storm.container.cgroup.core.CgroupCore;
+import org.apache.storm.container.cgroup.core.CpuacctCore;
+import org.apache.storm.container.cgroup.core.CpuacctCore.StatType;
+
+/**
+ * Report CPU used in the cgroup
+ */
+public class CGroupCpu extends CGroupMetricsBase<Map<String,Long>> {
+ long previousSystem = 0;
+ long previousUser = 0;
+ private int userHz = -1;
+
+ public CGroupCpu(Map<String, Object> conf) {
+ super(conf, SubSystemType.cpuacct);
+ }
+
+ public synchronized int getUserHZ() throws IOException {
+ if (userHz < 0) {
+ ProcessBuilder pb = new ProcessBuilder("getconf", "CLK_TCK");
+ Process p = pb.start();
+ BufferedReader in = new BufferedReader(new
InputStreamReader(p.getInputStream()));
+ String line = in.readLine().trim();
+ userHz = Integer.valueOf(line);
+ }
+ return userHz;
+ }
+
+ @Override
+ public Map<String, Long> getDataFrom(CgroupCore core) throws
IOException {
+ CpuacctCore cpu = (CpuacctCore) core;
+ Map<StatType, Long> stat = cpu.getCpuStat();
--- End diff --
All of the CGroupCore subclasses throw an IOException. I thought it would
be better to have the parent class handle it rather then have the children each
have the same code copied and pasted. On some I guess I forgot to clean it
up. Will do.
---
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.
---
