You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sn...@apache.org on 2020/06/05 10:41:05 UTC
[hadoop] branch branch-3.3 updated: YARN-10284. Add lazy
initialization of LogAggregationFileControllerFactory in LogServlet.
Contributed by Adam Antal
This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new ac307fe YARN-10284. Add lazy initialization of LogAggregationFileControllerFactory in LogServlet. Contributed by Adam Antal
ac307fe is described below
commit ac307fe20d7ce3940955958c0bf91d620f805b9a
Author: Szilard Nemeth <sn...@apache.org>
AuthorDate: Fri Jun 5 12:39:52 2020 +0200
YARN-10284. Add lazy initialization of LogAggregationFileControllerFactory in LogServlet. Contributed by Adam Antal
---
.../hadoop/yarn/server/webapp/LogServlet.java | 16 +++++--
.../hadoop/yarn/server/webapp/TestLogServlet.java | 52 ++++++++++++++++++++++
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/LogServlet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/LogServlet.java
index 991e984..33de8df 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/LogServlet.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/LogServlet.java
@@ -62,15 +62,23 @@ public class LogServlet extends Configured {
private static final Joiner JOINER = Joiner.on("");
private static final String NM_DOWNLOAD_URI_STR = "/ws/v1/node/containers";
- private final LogAggregationFileControllerFactory factory;
+ private LogAggregationFileControllerFactory factoryInstance = null;
private final AppInfoProvider appInfoProvider;
public LogServlet(Configuration conf, AppInfoProvider appInfoProvider) {
super(conf);
- this.factory = new LogAggregationFileControllerFactory(conf);
this.appInfoProvider = appInfoProvider;
}
+ private LogAggregationFileControllerFactory getOrCreateFactory() {
+ if (factoryInstance != null) {
+ return factoryInstance;
+ } else {
+ factoryInstance = new LogAggregationFileControllerFactory(getConf());
+ return factoryInstance;
+ }
+ }
+
@VisibleForTesting
public String getNMWebAddressFromRM(String nodeId)
throws ClientHandlerException, UniformInterfaceException, JSONException {
@@ -226,7 +234,7 @@ public class LogServlet extends Configured {
String nmId, boolean redirectedFromNode,
String clusterId, boolean manualRedirection) {
- builder.setFactory(factory);
+ builder.setFactory(getOrCreateFactory());
BasicAppInfo appInfo;
try {
@@ -361,6 +369,8 @@ public class LogServlet extends Configured {
"Invalid ContainerId: " + containerIdStr);
}
+ LogAggregationFileControllerFactory factory = getOrCreateFactory();
+
final long length = LogWebServiceUtils.parseLongParam(size);
ApplicationId appId = containerId.getApplicationAttemptId()
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/webapp/TestLogServlet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/webapp/TestLogServlet.java
new file mode 100644
index 0000000..130e154
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/webapp/TestLogServlet.java
@@ -0,0 +1,52 @@
+/**
+ * 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.hadoop.yarn.server.webapp;
+
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.logaggregation.filecontroller.LogAggregationFileControllerFactory;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+
+public class TestLogServlet {
+ /**
+ * Test that {@link LogServlet}'s constructor does not throw exception,
+ * if the log aggregation properties are bad.
+ */
+ @Test
+ public void testLogServletNoException() {
+ YarnConfiguration conf = new YarnConfiguration();
+ conf.set(YarnConfiguration.LOG_AGGREGATION_FILE_FORMATS, "22");
+
+ // first test the factory's constructor throws exception
+ try {
+ LogAggregationFileControllerFactory factory =
+ new LogAggregationFileControllerFactory(conf);
+ fail("LogAggregationFileControllerFactory should have thrown exception");
+ } catch (IllegalArgumentException expected) {
+ }
+
+ // LogServlet should not throw exception
+ AppInfoProvider aip = mock(AppInfoProvider.class);
+ LogServlet ls = new LogServlet(conf, aip);
+ assertThat(ls).isNotNull();
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org