jiajunwang commented on a change in pull request #1187: URL: https://github.com/apache/helix/pull/1187#discussion_r469609613
########## File path: helix-core/src/main/java/org/apache/helix/monitoring/mbeans/CustomizedViewMonitor.java ########## @@ -0,0 +1,154 @@ +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"; + private ClusterStatusMonitor _clusterStatusMonitor; + + 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,%s=%s", MonitorDomainNames.AggregatedView.name(), "Type", + "CustomizedView", "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 + * Latency reporting excludes: updating a customized state that is the same as previous customized state, + * deleting a customized state + * @param updatedCustomizedViews Customized views that have been updated, obtained from CustomizedStateOutput + * @param curCustomizedViews Current customized view values from the CustomizedViewCache + * @param updatedStartTimestamps All customized state START_TIME property values from CustomizedStateOutput. + * START_TIME field is automatically updated when a customized state for a partition is updated by CustomizedStateProvider. + * @param updateSuccess If the customized view update to ZK is successful or not + * @param endTime The timestamp when the new customized view is updated to ZK + */ + public void reportLatency(List<CustomizedView> updatedCustomizedViews, Review comment: So this is a single metric for all the states. I'm thinking if we will need per-resource metrics in the future? The thing is that, if you do per-resource for now, we can always get the global latency data by aggregating on the readers' side. But if you do the global latency, then there is no way we can get per-resource latency. ########## File path: helix-core/src/main/java/org/apache/helix/monitoring/mbeans/CustomizedViewMonitor.java ########## @@ -0,0 +1,154 @@ +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"; + private ClusterStatusMonitor _clusterStatusMonitor; + + public CustomizedViewMonitor(String clusterName) { + _clusterName = clusterName; + _sensorName = String.format("%s.%s", MonitorDomainNames.AggregatedView.name(), _clusterName); Review comment: This should match the ObjectName ########## File path: helix-core/src/main/java/org/apache/helix/monitoring/mbeans/CustomizedViewMonitor.java ########## @@ -0,0 +1,154 @@ +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"; + private ClusterStatusMonitor _clusterStatusMonitor; + + 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,%s=%s", MonitorDomainNames.AggregatedView.name(), "Type", + "CustomizedView", "Cluster", _clusterName)); Review comment: nit, remove the "CustomizedView" hard code. ########## File path: helix-core/src/main/java/org/apache/helix/controller/stages/CustomizedViewAggregationStage.java ########## @@ -112,15 +119,22 @@ public void execute(final ClusterEvent event) throws Exception { } // add/update customized-views from zk and cache if (updatedCustomizedViews.size() > 0) { - dataAccessor.setChildren(keys, updatedCustomizedViews); + boolean[] success = dataAccessor.setChildren(keys, updatedCustomizedViews); cache.updateCustomizedViews(stateType, updatedCustomizedViews); + asyncReportLatency(cache.getAsyncTasksThreadPool(), + event.getAttribute(AttributeName.clusterStatusMonitor.name()), + new ArrayList<>(updatedCustomizedViews), curCustomizedViewsCopy, + new HashMap<>(updatedStartTimestamps), success, System.currentTimeMillis(), Review comment: System.currentTimeMillis() can be inside asyncReportLatency. ########## File path: helix-core/src/main/java/org/apache/helix/controller/stages/CustomizedViewAggregationStage.java ########## @@ -88,7 +93,9 @@ public void execute(final ClusterEvent event) throws Exception { // update customized view for (String stateType : customizedStateOutput.getAllStateTypes()) { List<CustomizedView> updatedCustomizedViews = new ArrayList<>(); + Map<String, Map<Partition, Map<String, Long>>> updatedStartTimestamps = new HashMap<>(); Map<String, CustomizedView> curCustomizedViews = new HashMap<>(); + Map<String, CustomizedView> curCustomizedViewsCopy = new HashMap<>(); Review comment: As we discussed, since this stage is already async stage, we don't need to introduce these complicities, we can make the report logic synchronizely done in this stage. ---------------------------------------------------------------- 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]
