diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/dev-support/findbugs-exclude.xml new file mode 100644 index 0000000..8688a15 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/dev-support/findbugs-exclude.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/dev-support/findbugs-exclude.xml deleted file mode 100644 index b89146a..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/dev-support/findbugs-exclude.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java index ef45d10..879b073 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -3264,7 +3264,7 @@ public int flex(String clustername, Map roleInstances) int updateCount = Integer.parseInt(updateCountStr); // if component was specified before, get the current count if (component.get(COMPONENT_INSTANCES) != null) { - currentCount = Integer.valueOf(component.get(COMPONENT_INSTANCES)); + currentCount = Integer.parseInt(component.get(COMPONENT_INSTANCES)); if (currentCount + updateCount < 0) { throw new BadCommandArgumentsException("The requested count " + "of \"%s\" for role %s makes the total number of " + @@ -3574,16 +3574,16 @@ public int actionResolve(ActionResolveArgs args) // as this is an API entry point, validate // the arguments args.validate(); - RegistryOperations operations = getRegistryOperations(); String path = SliderRegistryUtils.resolvePath(args.path); ServiceRecordMarshal serviceRecordMarshal = new ServiceRecordMarshal(); try { if (args.list) { File destDir = args.destdir; - if (destDir != null) { - destDir.mkdirs(); + if (destDir != null && !destDir.mkdirs()) { + throw new IOException("Failed to create directory for " + destDir); } + Map recordMap; Map znodes; try { @@ -4109,11 +4109,8 @@ public void actionRegistryListConfigsYarn(ActionRegistryArgs registryArgs) if (!registryArgs.verbose) { out.println(configName); } else { - PublishedConfiguration published = - configurations.get(configName); - out.printf("%s: %s\n", - configName, - published.description); + PublishedConfiguration published = configurations.get(configName); + out.printf("%s: %s%n", configName, published.description); } } } finally { @@ -4157,9 +4154,7 @@ public void actionRegistryListExports(ActionRegistryArgs registryArgs) out.println(exportName); } else { PublishedExports published = exports.get(exportName); - out.printf("%s: %s\n", - exportName, - published.description); + out.printf("%s: %s%n", exportName, published.description); } } } finally { @@ -4365,9 +4360,8 @@ public RegistryOperations getRegistryOperations() * Output to standard out/stderr (implementation specific detail) * @param src source */ - @SuppressWarnings("UseOfSystemOutOrSystemErr") private static void print(CharSequence src) { - clientOutputStream.append(src); + clientOutputStream.print(src); } /** @@ -4375,8 +4369,7 @@ private static void print(CharSequence src) { * @param message message */ private static void println(String message) { - print(message); - print("\n"); + clientOutputStream.println(message); } /** * Output to standard out/stderr with a newline after, formatted @@ -4384,8 +4377,7 @@ private static void println(String message) { * @param args arguments for string formatting */ private static void println(String message, Object ... args) { - print(String.format(message, args)); - print("\n"); + clientOutputStream.println(String.format(message, args)); } /** @@ -4461,12 +4453,6 @@ private int actionHelp(String actionName) throws YarnException, IOException { throw new UsageException(CommonArgs.usage(serviceArgs, actionName)); } - private int actionHelp(String errMsg, String actionName) - throws YarnException, IOException { - throw new UsageException("%s %s", errMsg, CommonArgs.usage(serviceArgs, - actionName)); - } - /** * List the nodes in the cluster, possibly filtering by node state or label. * diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/TokensOperation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/TokensOperation.java index 9b9c141..84c65b3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/TokensOperation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/TokensOperation.java @@ -75,11 +75,10 @@ public int actionTokens(ActionTokensArgs args, FileSystem fs, } saveTokens(output, credentials); String filename = output.getCanonicalPath(); - footnote = String.format("%d tokens saved to %s\n" + - "To use these in the environment:\n" + - "export %s=%s", - credentials.numberOfTokens(), - filename, UserGroupInformation.HADOOP_TOKEN_FILE_LOCATION, filename); + footnote = String.format( + "%d tokens saved to %s%n" + "To use these in the environment:%n" + + "export %s=%s", credentials.numberOfTokens(), filename, + UserGroupInformation.HADOOP_TOKEN_FILE_LOCATION, filename); } else if (args.source != null) { File source = args.source; log.info("Reading credentials from file {}", source); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/rest/SliderApplicationApiRestClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/rest/SliderApplicationApiRestClient.java index 4283ee8..573ef64 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/rest/SliderApplicationApiRestClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/rest/SliderApplicationApiRestClient.java @@ -297,20 +297,6 @@ public PingInformation pingPost(String text) throws IOException { .type(MediaType.APPLICATION_JSON_TYPE) .post(PingInformation.class, f); } - - /** - * Ping as a POST - * @param text text to include - * @return the response - * @throws IOException on any failure - */ - public PingInformation pingPut(String text) throws IOException { - WebResource pingResource = applicationResource(ACTION_PING); - Form f = new Form(); - return pingResource - .type(MediaType.TEXT_PLAIN) - .put(PingInformation.class, text); - } @Override public void stop(String text) throws IOException { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java index e3cb288..de58e5c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java @@ -142,11 +142,12 @@ public void validate() throws BadCommandArgumentsException, UsageException { log.error(message); int index = 1; + StringBuffer buf = new StringBuffer(message); for (String actionArg : parameters) { log.error("[{}] \"{}\"", index++, actionArg); - message += " \"" + actionArg + "\" "; + buf.append(" \"" + actionArg + "\" "); } - throw new BadCommandArgumentsException(message); + throw new BadCommandArgumentsException(buf.toString()); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java index 20a9989..1d28c78 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java @@ -214,7 +214,6 @@ public ConfTree buildResourceOptionsConfTree() throws protected ConfTree buildConfTree(Map optionsMap) throws BadCommandArgumentsException { ConfTree confTree = new ConfTree(); - ConfTreeOperations ops = new ConfTreeOperations(confTree); confTree.global.putAll(optionsMap); return confTree; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java index 162a87d..9c8e65d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java @@ -154,12 +154,12 @@ public static String usage(CommonArgs serviceArgs) { public void parse() throws SliderException { addActionArguments(); try { - commander.parse(getArgs()); + commander.parse(args); } catch (ParameterException e) { throw new BadCommandArgumentsException(e, "%s in %s", e.toString(), - (getArgs() != null - ? (SliderUtils.join(getArgs(), + (args != null + ? (SliderUtils.join(args, " ", false)) : "[]")); } @@ -297,7 +297,4 @@ public String getAction() { return coreAction.parameters; } - public String[] getArgs() { - return args; - } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/Comparators.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/Comparators.java index 6380d0c..a83901b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/Comparators.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/Comparators.java @@ -29,25 +29,18 @@ public static class LongComparator implements Comparator, Serializable { @Override public int compare(Long o1, Long o2) { - long result = o1 - o2; - // need to comparisons with a diff greater than integer size - if (result < 0 ) { - return -1; - } else if (result > 0) { - return 1; - } - return 0; + return o1.compareTo(o2); } } -public static class InvertedLongComparator implements Comparator, Serializable { - private static final LongComparator inner = new LongComparator(); + + public static class InvertedLongComparator + implements Comparator, Serializable { @Override public int compare(Long o1, Long o2) { - return -inner.compare(o1, o2); + return o2.compareTo(o1); } } - /** * Little template class to reverse any comparitor * @param the type that is being compared diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java index aa5edf1..c3d6d98 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java @@ -464,37 +464,6 @@ public boolean isFile(Path path) { } /** - * Verify that a file exists in the zip file given by path - * @param path path to zip file - * @param file file expected to be in zip - * @throws FileNotFoundException file not found or is not a zip file - * @throws IOException trouble with FS - */ - public void verifyFileExistsInZip(Path path, String file) throws IOException { - fileSystem.copyToLocalFile(path, new Path("/tmp")); - File dst = new File((new Path("/tmp", path.getName())).toString()); - Enumeration entries; - ZipFile zipFile = new ZipFile(dst); - boolean found = false; - - try { - entries = zipFile.entries(); - while (entries.hasMoreElements()) { - ZipEntry entry = entries.nextElement(); - String nm = entry.getName(); - if (nm.endsWith(file)) { - found = true; - break; - } - } - } finally { - zipFile.close(); - } - dst.delete(); - if (!found) throw new FileNotFoundException("file: " + file + " not found in " + path); - log.info("Verification of " + path + " passed"); - } - /** * Create the application-instance specific temporary directory * in the DFS * diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java index 4457957..287dedd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java @@ -310,10 +310,6 @@ public static File findContainingJar(Class my_class) throws IOException { } String class_file = my_class.getName().replaceAll("\\.", "/") + ".class"; Enumeration urlEnumeration = loader.getResources(class_file); - if (urlEnumeration == null) { - throw new IOException("Unable to find resources for class " + my_class); - } - for (; urlEnumeration.hasMoreElements(); ) { URL url = urlEnumeration.nextElement(); if ("jar".equals(url.getProtocol())) { @@ -756,10 +752,10 @@ public static String instanceDetailsToString(String name, public static String containersToString( List containers, String version, Set components) { - String containerf = " %-28s %30s %45s %s\n"; + String containerf = " %-28s %30s %45s %s%n"; StringBuilder builder = new StringBuilder(512); - builder.append("Containers:\n"); - builder.append(String.format(" %-28s %30s %45s %s\n", "Component Name", + builder.append("Containers:%n"); + builder.append(String.format(" %-28s %30s %45s %s%n", "Component Name", "App Version", "Container Id", "Container Info/Logs")); for (ContainerInformation container : containers) { if (filter(container.appVersion, version) @@ -2278,17 +2274,15 @@ public static void validateExe(String program, File exe) throws IOException { public static void write(File outfile, byte[] data, boolean createParent) throws IOException { File parentDir = outfile.getCanonicalFile().getParentFile(); - if (parentDir == null) { - throw new IOException(outfile.getPath() + " has no parent dir"); - } - if (createParent) { - parentDir.mkdirs(); + if (parentDir != null && createParent) { + if (!parentDir.mkdirs()) { + throw new IOException("Failed to create parent directory of " + outfile + .getCanonicalFile()); + } } - SliderUtils.verifyIsDir(parentDir, log); try(FileOutputStream out = new FileOutputStream(outfile)) { out.write(data); } - } /** diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/buildutils/InstanceBuilder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/buildutils/InstanceBuilder.java index f0686af..f14a07a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/buildutils/InstanceBuilder.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/buildutils/InstanceBuilder.java @@ -142,7 +142,6 @@ public void init( md.put(StatusKeys.INFO_CREATE_TIME_HUMAN, SliderUtils.toGMTString(time)); md.put(StatusKeys.INFO_CREATE_TIME_MILLIS, Long.toString(time)); - MapOperations globalOptions = internalOps.getGlobalOptions(); BuildHelper.addBuildMetadata(md, "create"); SliderUtils.setInfoTime(md, StatusKeys.INFO_CREATE_TIME_HUMAN, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/AggregateConf.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/AggregateConf.java index 18c3156..a272420 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/AggregateConf.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/AggregateConf.java @@ -163,7 +163,7 @@ public void resolve() throws BadConfigException { public String getPassphrase() { if (passphrase == null) { passphrase = RandomStringUtils.randomAlphanumeric( - Integer.valueOf(SliderKeys.PASS_LEN)); + Integer.parseInt(SliderKeys.PASS_LEN)); } return passphrase; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java index be7c56f..74b6abb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java @@ -79,17 +79,6 @@ public Map> components = new HashMap<>(INITAL_MAP_CAPACITY); - - /** - * Shallow clone - * @return a shallow clone - * @throws CloneNotSupportedException - */ - @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - @Override public String toString() { try { @@ -105,9 +94,7 @@ public String toString() { * @return a JSON string description * @throws IOException Problems mapping/writing the object */ - public String toJson() throws IOException, - JsonGenerationException, - JsonMappingException { + public String toJson() throws IOException { return ConfTreeSerDeser.toString(this); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java index 7fb3158..d59db1c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/persist/AppDefinitionPersister.java @@ -147,7 +147,9 @@ public void processSuppliedDefinitions(String clustername, File tempDir = Files.createTempDir(); File pkgSrcDir = new File(tempDir, "default"); - pkgSrcDir.mkdirs(); + if (!pkgSrcDir.mkdirs()) { + throw new IOException("Failed to create directory " + pkgSrcDir); + } File destMetaInfo = new File(pkgSrcDir, "metainfo.json"); if (isFileUsed) { if (buildInfo.appMetaInfo.getName().endsWith(".xml")) { @@ -194,9 +196,11 @@ public void processSuppliedDefinitions(String clustername, List addons = new ArrayList(); Map addonMap = buildInfo.addonDelegate.getAddonMap(); - for (String key : addonMap.keySet()) { - File defPath = new File(addonMap.get(key)); - if (SliderUtils.isUnset(addonMap.get(key))) { + for (Map.Entry entry : addonMap.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + File defPath = new File(value); + if (SliderUtils.isUnset(value)) { throw new BadConfigException("Invalid path for addon package " + key); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/retrieve/AMWebClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/retrieve/AMWebClient.java index 40fa217..e204178 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/retrieve/AMWebClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/retrieve/AMWebClient.java @@ -62,61 +62,10 @@ public AMWebClient(Configuration conf) { restClient = new BaseRestClient(binding.createJerseyClient()); } - - - private static URLConnectionClientHandler getUrlConnectionClientHandler() { - return new URLConnectionClientHandler(new HttpURLConnectionFactory() { - @Override - public HttpURLConnection getHttpURLConnection(URL url) - throws IOException { - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - if (connection.getResponseCode() == HttpURLConnection.HTTP_MOVED_TEMP) { - // is a redirect - are we changing schemes? - String redirectLocation = connection.getHeaderField(HttpHeaders.LOCATION); - String originalScheme = url.getProtocol(); - String redirectScheme = URI.create(redirectLocation).getScheme(); - if (!originalScheme.equals(redirectScheme)) { - // need to fake it out by doing redirect ourselves - log.info("Protocol change during redirect. Redirecting {} to URL {}", - url, redirectLocation); - URL redirectURL = new URL(redirectLocation); - connection = (HttpURLConnection) redirectURL.openConnection(); - } - } - if (connection instanceof HttpsURLConnection) { - log.debug("Attempting to configure HTTPS connection using client " - + "configuration"); - final SSLFactory factory; - final SSLSocketFactory sf; - final HostnameVerifier hv; - - try { - HttpsURLConnection c = (HttpsURLConnection) connection; - factory = new SSLFactory(SSLFactory.Mode.CLIENT, new Configuration()); - factory.init(); - sf = factory.createSSLSocketFactory(); - hv = factory.getHostnameVerifier(); - c.setSSLSocketFactory(sf); - c.setHostnameVerifier(hv); - } catch (Exception e) { - log.info("Unable to configure HTTPS connection from " - + "configuration. Using JDK properties."); - } - - } - return connection; - } - }); - } - public WebResource resource(String url) { return restClient.resource(url); } - public BaseRestClient getRestClient() { - return restClient; - } - /** * Execute the operation. Failures are raised as IOException subclasses * @param method method to execute diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/restclient/HttpOperationResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/restclient/HttpOperationResponse.java deleted file mode 100644 index 0266223..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/restclient/HttpOperationResponse.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.slider.core.restclient; - -import java.util.List; -import java.util.Map; - -/** - * A response for use as a return value from operations - */ -public class HttpOperationResponse { - - public int responseCode; - public long lastModified; - public String contentType; - public byte[] data; - public Map> headers; -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/restclient/UrlConnectionOperations.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/restclient/UrlConnectionOperations.java index 20ef198..46f0d02 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/restclient/UrlConnectionOperations.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/restclient/UrlConnectionOperations.java @@ -87,124 +87,4 @@ public HttpURLConnection openConnection(URL url) throws Preconditions.checkArgument(url.getPort() != 0, "no port"); return (HttpURLConnection) connectionFactory.openConnection(url, useSpnego); } - - public HttpOperationResponse execGet(URL url) throws - IOException, - AuthenticationException { - return execHttpOperation(HttpVerb.GET, url, null, ""); - } - - public HttpOperationResponse execHttpOperation(HttpVerb verb, - URL url, - byte[] payload, - String contentType) - throws IOException, AuthenticationException { - HttpURLConnection conn = null; - HttpOperationResponse outcome = new HttpOperationResponse(); - int resultCode; - byte[] body = null; - log.debug("{} {} spnego={}", verb, url, useSpnego); - - boolean doOutput = verb.hasUploadBody(); - if (doOutput) { - Preconditions.checkArgument(payload !=null, - "Null payload on a verb which expects one"); - } - try { - conn = openConnection(url); - conn.setRequestMethod(verb.getVerb()); - conn.setDoOutput(doOutput); - if (doOutput) { - conn.setRequestProperty("Content-Type", contentType); - } - - // now do the connection - conn.connect(); - - if (doOutput) { - OutputStream output = conn.getOutputStream(); - IOUtils.write(payload, output); - output.close(); - } - - resultCode = conn.getResponseCode(); - outcome.lastModified = conn.getLastModified(); - outcome.contentType = conn.getContentType(); - outcome.headers = conn.getHeaderFields(); - InputStream stream = conn.getErrorStream(); - if (stream == null) { - stream = conn.getInputStream(); - } - if (stream != null) { - // read into a buffer. - body = IOUtils.toByteArray(stream); - } else { - // no body: - log.debug("No body in response"); - - } - } catch (SSLException e) { - throw e; - } catch (IOException e) { - throw NetUtils.wrapException(url.toString(), - url.getPort(), "localhost", 0, e); - - } catch (AuthenticationException e) { - throw new AuthenticationException("From " + url + ": " + e, e); - - } finally { - if (conn != null) { - conn.disconnect(); - } - } - uprateFaults(HttpVerb.GET, url.toString(), resultCode, "", body); - outcome.responseCode = resultCode; - outcome.data = body; - return outcome; - } - - /** - * Uprate error codes 400 and up into faults; - * 404 is converted to a {@link NotFoundException}, - * 401 to {@link ForbiddenException} - * - * @param verb HTTP Verb used - * @param url URL as string - * @param resultCode response from the request - * @param bodyAsString - *@param body optional body of the request @throws IOException if the result was considered a failure - */ - public static void uprateFaults(HttpVerb verb, String url, - int resultCode, String bodyAsString, byte[] body) - throws IOException { - - if (resultCode < 400) { - //success - return; - } - String msg = verb.toString() +" "+ url; - if (resultCode == 404) { - throw new NotFoundException(msg); - } - if (resultCode == 401) { - throw new ForbiddenException(msg); - } - // all other error codes - - // get a string respnse - if (bodyAsString == null) { - if (body != null && body.length > 0) { - bodyAsString = new String(body); - } else { - bodyAsString = ""; - } - } - String message = msg + - " failed with exit code " + resultCode - + ", body length " + bodyAsString.length() - + ":\n" + bodyAsString; - log.error(message); - throw new IOException(message); - } - } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/MiniZooKeeperCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/MiniZooKeeperCluster.java index c8b3adb..d33cc11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/MiniZooKeeperCluster.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/MiniZooKeeperCluster.java @@ -229,17 +229,6 @@ private void recreateDir(File dir) throws IOException { } } - /** - * Delete the basedir - */ - private void deleteBaseDir() { - if (baseDir != null) { - baseDir.delete(); - baseDir = null; - } - - } - @Override protected void serviceStop() throws Exception { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java index 6ed58d5..ef96c9b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java @@ -43,14 +43,14 @@ /** * Base path for services */ - public static String ZK_SERVICES = "services"; + public static final String ZK_SERVICES = "services"; /** * Base path for all Slider references */ - public static String ZK_SLIDER = "slider"; - public static String ZK_USERS = "users"; - public static String SVC_SLIDER = "/" + ZK_SERVICES + "/" + ZK_SLIDER; - public static String SVC_SLIDER_USERS = SVC_SLIDER + "/" + ZK_USERS; + public static final String ZK_SLIDER = "slider"; + public static final String ZK_USERS = "users"; + public static final String SVC_SLIDER = "/" + ZK_SERVICES + "/" + ZK_SLIDER; + public static final String SVC_SLIDER_USERS = SVC_SLIDER + "/" + ZK_USERS; public static final List ZK_USERS_PATH_LIST = new ArrayList(); static { @@ -59,7 +59,7 @@ ZK_USERS_PATH_LIST.add(ZK_USERS); } - public static int SESSION_TIMEOUT = 30000; + public static final int SESSION_TIMEOUT = 30000; protected static final Logger log = LoggerFactory.getLogger(ZKIntegration.class); private ZooKeeper zookeeper; @@ -279,14 +279,6 @@ public void mkPath(List paths, } } -/** - * Blocking enum of users - * @return an unordered list of clusters under a user - */ - public List getClusters() throws KeeperException, InterruptedException { - return zookeeper.getChildren(userPath, null); - } - /** * Delete a node, does not throw an exception if the path is not fond * @param path path to delete diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java index cff5ed8..f253f83 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java @@ -764,9 +764,9 @@ public void dereferenceAllConfigs( } } } - - for (String configType : configurations.keySet()) { - Map configBucket = configurations.get(configType); + for (Map.Entry> configEntry : configurations + .entrySet()) { + Map configBucket = configEntry.getValue(); for (Map.Entry entry: configBucket.entrySet()) { String configName = entry.getKey(); String configValue = entry.getValue(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java index 1482062..11f3f8d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/docker/DockerProviderService.java @@ -257,7 +257,8 @@ public void applyInitialRegistryDefinitions(URL amWebURI, .getInternalsSnapshot(), null, getClusterName(), clientName, clientName, getAmState()); - for (String configFileDN : configurations.keySet()) { + for (Map.Entry> entry : configurations.entrySet()) { + String configFileDN = entry.getKey(); String configFileName = appConf.getComponentOpt(clientName, OptionKeys.CONF_FILE_PREFIX + configFileDN + OptionKeys .NAME_SUFFIX, null); @@ -269,7 +270,7 @@ public void applyInitialRegistryDefinitions(URL amWebURI, } ConfigFormat configFormat = ConfigFormat.resolve(configFileType); - Map config = configurations.get(configFileDN); + Map config = entry.getValue(); ConfigUtils.prepConfigForTemplateOutputter(configFormat, config, fileSystem, getClusterName(), new File(configFileName).getName()); @@ -365,9 +366,10 @@ protected void publishExportGroups(String containerId, for (Entry export : exports.entrySet()) { String value = export.getValue(); // replace host names and site properties - for (String token : replaceTokens.keySet()) { + for (Map.Entry entry : replaceTokens.entrySet()) { + String token = entry.getKey(); if (value.contains(token)) { - value = value.replaceAll(Pattern.quote(token), replaceTokens.get(token)); + value = value.replaceAll(Pattern.quote(token), entry.getValue()); } } ExportEntry entry = new ExportEntry(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/BoolMetric.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/BoolMetric.java index 33f8d85..89dfbfd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/BoolMetric.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/BoolMetric.java @@ -47,21 +47,6 @@ public Integer getValue() { return value.get() ? 1 : 0; } - /** - * Evaluate from a string. Returns true if the string is considered to match 'true', - * false otherwise. - * @param s source - * @return true if the input parses to an integer other than 0. False if it doesn't parse - * or parses to 0. - */ - public static boolean fromString(String s) { - try { - return Integer.valueOf(s) != 0; - } catch (NumberFormatException e) { - return false; - } - } - @Override public String toString() { return value.toString(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsAndMonitoring.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsAndMonitoring.java index 37a8935..1fe8ea6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsAndMonitoring.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsAndMonitoring.java @@ -58,11 +58,6 @@ public MetricsAndMonitoring() { private final List metricSets = new ArrayList<>(); - /** - * List of recorded events - */ - private final List eventHistory = new ArrayList<>(100); - public static final int EVENT_LIMIT = 1000; public MetricRegistry getMetrics() { @@ -139,26 +134,6 @@ public void markMeterAndCounter(String name) { return register(MetricRegistry.name(klass, names), metric); } - - /** - * Add an event (synchronized) - * @param event event - */ - public synchronized void noteEvent(RecordedEvent event) { - if (eventHistory.size() > EVENT_LIMIT) { - eventHistory.remove(0); - } - eventHistory.add(event); - } - - /** - * Clone the event history; blocks for the duration of the copy operation. - * @return a new list - */ - public synchronized List cloneEventHistory() { - return new ArrayList<>(eventHistory); - } - /** * Add a metric set for registering and deregistration on service stop * @param metricSet metric set diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/RecordedEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/RecordedEvent.java deleted file mode 100644 index d48d337..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/management/RecordedEvent.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.slider.server.appmaster.management; - -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; - -import java.text.DateFormat; - -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) -public class RecordedEvent { - private static final DateFormat dateFormat = DateFormat.getDateInstance(); - public long id; - public String name; - public long timestamp; - public String time; - public String category; - public String host; - public int role; - public String text; - - public RecordedEvent() { - } - - /** - * Create an event. The timestamp is also converted to a time string - * @param id id counter - * @param name event name - * @param timestamp timestamp. If non-zero, is used to build the {@code time} text field. - * @param category even category - * @param text arbitrary text - */ - public RecordedEvent(long id, String name, long timestamp, String category, String text) { - this.id = id; - this.name = name; - this.timestamp = timestamp; - this.time = timestamp > 0 ? dateFormat.format(timestamp) : ""; - this.category = category; - this.text = text; - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java index cc17cf0..fd60d7d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java @@ -253,7 +253,7 @@ public String toFullString() { new StringBuilder(toString()); sb.append("{ "); for (NodeEntry entry : nodeEntries) { - sb.append(String.format("\n [%02d] ", entry.rolePriority)); + sb.append(String.format("%n [%02d] ", entry.rolePriority)); sb.append(entry.toString()); } sb.append("} "); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java index 0a3a3c9..98557ce 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java @@ -321,10 +321,6 @@ public long getCompleted() { return completed.get(); } - public synchronized void setCompleted(int completed) { - this.completed.set(completed); - } - public long incCompleted() { return completed.incrementAndGet(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/InsecureAmFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/InsecureAmFilter.java index d5b6b36..b4a92ba 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/InsecureAmFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/InsecureAmFilter.java @@ -69,7 +69,6 @@ public void doFilter(ServletRequest req, FilterChain chain) throws IOException, ServletException { rejectNonHttpRequests(req); HttpServletRequest httpReq = (HttpServletRequest) req; - HttpServletResponse httpResp = (HttpServletResponse) resp; String requestURI = httpReq.getRequestURI(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java index 1622309..43f0e4e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java @@ -41,7 +41,6 @@ protected AbstractSliderLaunchedService(String name) { super(name); // make sure all the yarn configs get loaded - YarnConfiguration conf = new YarnConfiguration(); ConfigHelper.registerDeprecatedConfigItems(); } @@ -74,7 +73,6 @@ public RegistryOperations startRegistryOperationsService() throws BadConfigException { // push back the slider registry entry if needed - String quorum = lookupZKQuorum(); RegistryOperations registryWriterService = createRegistryOperationsInstance(); deployChildService(registryWriterService);