mynameborat commented on a change in pull request #1421:
URL: https://github.com/apache/samza/pull/1421#discussion_r476719396
##########
File path:
samza-yarn/src/main/java/org/apache/samza/validation/YarnJobValidationTool.java
##########
@@ -158,23 +159,24 @@ public void validateJmxMetrics() throws Exception {
CoordinatorStreamStore coordinatorStreamStore = new
CoordinatorStreamStore(config, metricsRegistry);
coordinatorStreamStore.init();
try {
- Config configFromCoordinatorStream =
CoordinatorStreamUtil.readConfigFromCoordinatorStream(coordinatorStreamStore);
- ChangelogStreamManager changelogStreamManager = new
ChangelogStreamManager(coordinatorStreamStore);
- JobModelManager jobModelManager =
- JobModelManager.apply(configFromCoordinatorStream,
changelogStreamManager.readPartitionMapping(),
- coordinatorStreamStore, metricsRegistry);
+ LocalityManager localityManager =
+ new LocalityManager(new
NamespaceAwareCoordinatorStreamStore(coordinatorStreamStore, SetConfig.TYPE));
validator.init(config);
- Map<String, String> jmxUrls =
jobModelManager.jobModel().getAllContainerToHostValues(SetContainerHostMapping.JMX_TUNNELING_URL_KEY);
- for (Map.Entry<String, String> entry : jmxUrls.entrySet()) {
- String containerId = entry.getKey();
- String jmxUrl = entry.getValue();
- log.info("validate container " + containerId + " metrics with JMX: " +
jmxUrl);
- JmxMetricsAccessor jmxMetrics = new JmxMetricsAccessor(jmxUrl);
- jmxMetrics.connect();
- validator.validate(jmxMetrics);
- jmxMetrics.close();
- log.info("validate container " + containerId + " successfully");
+ LocalityModel localityModel = localityManager.readLocality();
+
+ for (ContainerLocality containerLocality :
localityModel.getContainerLocalities().values()) {
+ String containerId = containerLocality.id();
+ String jmxUrl = containerLocality.jmxTunnelingUrl();
+ if (StringUtils.isNotBlank(jmxUrl)) {
Review comment:
this is a CLI tool and I kept the old semantics as is in terms of how it
uses the locality information. I'd prefer to keep as is since this PR's scope
is not to fix how yarn job validation tool uses JMX.
##########
File path:
samza-core/src/main/java/org/apache/samza/serializers/model/JsonContainerLocalityMixIn.java
##########
@@ -0,0 +1,47 @@
+/*
+ * 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.samza.serializers.model;
+
+import org.codehaus.jackson.annotate.JsonCreator;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+
+/**
+ * A mix-in Jackson class to convert {@link
org.apache.samza.job.model.ContainerLocality} to/from JSON
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public abstract class JsonContainerLocalityMixIn {
+ @JsonCreator
+ public JsonContainerLocalityMixIn(@JsonProperty("id") String id,
@JsonProperty("host") String host,
+ @JsonProperty("jmx-url") String jmxUrl,
@JsonProperty("jmx-tunneling-url") String jmxTunnelingUrl) {
+ }
+
+ @JsonProperty("id")
Review comment:
done
----------------------------------------------------------------
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]
