You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/03/16 13:00:41 UTC
incubator-slider git commit: minor cleanup of some classes while
copying the code elsewhere
Repository: incubator-slider
Updated Branches:
refs/heads/develop 3fbfca9e6 -> 38fed9935
minor cleanup of some classes while copying the code elsewhere
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/38fed993
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/38fed993
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/38fed993
Branch: refs/heads/develop
Commit: 38fed99352d96f92a51813e54fab5e16123ca4b0
Parents: 3fbfca9
Author: Steve Loughran <st...@apache.org>
Authored: Mon Mar 16 12:00:25 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Mar 16 12:00:25 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/slider/api/SliderClusterProtocol.java | 1 -
.../main/java/org/apache/slider/common/tools/PortScanner.java | 2 +-
.../org/apache/slider/server/appmaster/rpc/SliderIPCService.java | 3 ++-
.../slider/server/appmaster/rpc/SliderRPCSecurityInfo.java | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/38fed993/slider-core/src/main/java/org/apache/slider/api/SliderClusterProtocol.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/api/SliderClusterProtocol.java b/slider-core/src/main/java/org/apache/slider/api/SliderClusterProtocol.java
index dbb8c99..3250bb1 100644
--- a/slider-core/src/main/java/org/apache/slider/api/SliderClusterProtocol.java
+++ b/slider-core/src/main/java/org/apache/slider/api/SliderClusterProtocol.java
@@ -18,7 +18,6 @@
package org.apache.slider.api;
-import com.google.protobuf.RpcController;
import org.apache.hadoop.ipc.VersionedProtocol;
import org.apache.hadoop.security.KerberosInfo;
import org.apache.hadoop.yarn.exceptions.YarnException;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/38fed993/slider-core/src/main/java/org/apache/slider/common/tools/PortScanner.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/PortScanner.java b/slider-core/src/main/java/org/apache/slider/common/tools/PortScanner.java
index 60fd008..b5b21ce 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/PortScanner.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/PortScanner.java
@@ -69,7 +69,7 @@ public class PortScanner {
}
public int getAvailablePort() throws SliderException {
- if (remainingPortsToCheck!=null) {
+ if (remainingPortsToCheck != null) {
return getAvailablePortViaPortArray();
} else {
return getAvailablePortViaCounter();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/38fed993/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderIPCService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderIPCService.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderIPCService.java
index a924940..d5822e9 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderIPCService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderIPCService.java
@@ -108,7 +108,8 @@ public class SliderIPCService extends AbstractService
CertificateManager certificateManager,
StateAccessForProviders state,
QueueAccess actionQueues,
- MetricsAndMonitoring metricsAndMonitoring, ContentCache cache) {
+ MetricsAndMonitoring metricsAndMonitoring,
+ ContentCache cache) {
super("SliderIPCService");
Preconditions.checkArgument(amOperations != null, "null amOperations");
Preconditions.checkArgument(state != null, "null appState");
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/38fed993/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderRPCSecurityInfo.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderRPCSecurityInfo.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderRPCSecurityInfo.java
index 215db1a..4fd4910 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderRPCSecurityInfo.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderRPCSecurityInfo.java
@@ -30,7 +30,9 @@ import org.apache.slider.common.SliderXmlConfKeys;
import java.lang.annotation.Annotation;
/**
- * This is where security may go
+ * This is where security information goes.
+ * It is referred to in the <code>META-INF/services/org.apache.hadoop.security.SecurityInfo</code>
+ * resource of this JAR, which is used to find the binding info
*/
public class SliderRPCSecurityInfo extends SecurityInfo {