jiajunwang commented on a change in pull request #1187: URL: https://github.com/apache/helix/pull/1187#discussion_r468261336
########## File path: helix-core/src/main/java/org/apache/helix/monitoring/mbeans/CustomizedViewMonitor.java ########## @@ -0,0 +1,149 @@ +package org.apache.helix.monitoring.mbeans; + +/* + * 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. + */ + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.management.JMException; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import com.codahale.metrics.Histogram; +import com.codahale.metrics.SlidingTimeWindowArrayReservoir; +import org.apache.helix.model.CustomizedView; +import org.apache.helix.model.Partition; +import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; +import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; +import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class CustomizedViewMonitor extends DynamicMBeanProvider { + private static final Logger LOG = LoggerFactory.getLogger(CustomizedViewMonitor.class); + + private static final String MBEAN_DESCRIPTION = "Helix Customized View Aggregation Monitor"; + private final String _clusterName; + private final String _sensorName; + private HistogramDynamicMetric _updateToAggregationLatencyGauge; + public static final String UPDATE_TO_AGGREGATION_LATENCY_GAUGE = + "UpdateToAggregationLatencyGauge"; + + public CustomizedViewMonitor(String clusterName) { + _clusterName = clusterName; + _sensorName = String.format("%s.%s", MonitorDomainNames.AggregatedView.name(), _clusterName); + _updateToAggregationLatencyGauge = + new HistogramDynamicMetric(UPDATE_TO_AGGREGATION_LATENCY_GAUGE, new Histogram( + new SlidingTimeWindowArrayReservoir(getResetIntervalInMs(), TimeUnit.MILLISECONDS))); + } + + @Override + public DynamicMBeanProvider register() throws JMException { + List<DynamicMetric<?, ?>> attributeList = new ArrayList<>(); + attributeList.add(_updateToAggregationLatencyGauge); + doRegister(attributeList, MBEAN_DESCRIPTION, getMBeanName()); + return this; + } + + private ObjectName getMBeanName() throws MalformedObjectNameException { + return new ObjectName(String + .format("%s:%s=%s", MonitorDomainNames.AggregatedView.name(), "Cluster", _clusterName)); Review comment: Besides cluster name, can we also have customized View as part of the key? Maybe type = customized view? This is mainly for future extension. ########## File path: helix-core/src/main/java/org/apache/helix/monitoring/mbeans/CustomizedViewMonitor.java ########## @@ -0,0 +1,149 @@ +package org.apache.helix.monitoring.mbeans; + +/* + * 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. + */ + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.management.JMException; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import com.codahale.metrics.Histogram; +import com.codahale.metrics.SlidingTimeWindowArrayReservoir; +import org.apache.helix.model.CustomizedView; +import org.apache.helix.model.Partition; +import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider; +import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric; +import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class CustomizedViewMonitor extends DynamicMBeanProvider { + private static final Logger LOG = LoggerFactory.getLogger(CustomizedViewMonitor.class); + + private static final String MBEAN_DESCRIPTION = "Helix Customized View Aggregation Monitor"; + private final String _clusterName; + private final String _sensorName; + private HistogramDynamicMetric _updateToAggregationLatencyGauge; + public static final String UPDATE_TO_AGGREGATION_LATENCY_GAUGE = + "UpdateToAggregationLatencyGauge"; + + public CustomizedViewMonitor(String clusterName) { + _clusterName = clusterName; + _sensorName = String.format("%s.%s", MonitorDomainNames.AggregatedView.name(), _clusterName); + _updateToAggregationLatencyGauge = + new HistogramDynamicMetric(UPDATE_TO_AGGREGATION_LATENCY_GAUGE, new Histogram( + new SlidingTimeWindowArrayReservoir(getResetIntervalInMs(), TimeUnit.MILLISECONDS))); + } + + @Override + public DynamicMBeanProvider register() throws JMException { + List<DynamicMetric<?, ?>> attributeList = new ArrayList<>(); + attributeList.add(_updateToAggregationLatencyGauge); + doRegister(attributeList, MBEAN_DESCRIPTION, getMBeanName()); + return this; + } + + private ObjectName getMBeanName() throws MalformedObjectNameException { + return new ObjectName(String + .format("%s:%s=%s", MonitorDomainNames.AggregatedView.name(), "Cluster", _clusterName)); + } + + @Override + public String getSensorName() { + return _sensorName; + } + + void recordUpdateToAggregationLatency(long latency) { + if (_updateToAggregationLatencyGauge != null) { + _updateToAggregationLatencyGauge.updateValue(latency); + } + } + + /** + * Find updated customized states and report the aggregation latency of each customized state Review comment: Please mention a little bit more about the parameter usage here. Basically we only update the timestamp if the state has been changed, right? ########## File path: helix-core/src/main/java/org/apache/helix/controller/dataproviders/ResourceControllerDataProvider.java ########## @@ -79,6 +82,7 @@ // Maintain a set of all ChangeTypes for change detection private Set<HelixConstants.ChangeType> _refreshedChangeTypes; private Set<String> _aggregationEnabledTypes = new HashSet<>(); + private Map<String, CustomizedViewMonitor> _customizedViewMonitors = new HashMap<>(); Review comment: On my second thought, let's follow the convention (refer to _clusterStatusMonitor) and put it in GenericHelixController. What do you think? The problem with the cache is that this object won't be available if we change to pass the snapshot later. In general, we should always use the event to carry the monitors. And GenericHelixController is one of the easiest options. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
