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 2018/03/05 13:02:45 UTC
[1/3] incubator-slider git commit: SLIDER-1261 CSR creation fails for
long hostnames greater than 64 chars [Forced Update!]
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-1259-multihomed b8652f042 -> 4286d30c6 (forced update)
SLIDER-1261 CSR creation fails for long hostnames greater than 64 chars
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7ee66cd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7ee66cd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7ee66cd7
Branch: refs/heads/feature/SLIDER-1259-multihomed
Commit: 7ee66cd7cc049fecc2d553f5541147702e81a5b0
Parents: 68b96b7
Author: Gour Saha <go...@apache.org>
Authored: Wed Feb 21 22:52:47 2018 -0800
Committer: Gour Saha <go...@apache.org>
Committed: Wed Feb 21 22:52:47 2018 -0800
----------------------------------------------------------------------
.../apache/slider/common/tools/SliderUtils.java | 10 ++++++++++
.../services/security/CertificateManager.java | 5 ++---
.../slider/common/tools/TestSliderUtils.java | 21 ++++++++++++++++++++
3 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7ee66cd7/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 8fdf77f..d834c2e 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -2650,4 +2650,14 @@ public final class SliderUtils {
}
return prefix;
}
+
+ public static String extractDomainNameFromFQDN(String fqdn) {
+ if (fqdn != null) {
+ fqdn = fqdn.trim();
+ if (fqdn.matches("[^\\.]+\\..+")) {
+ fqdn = fqdn.replaceFirst("[^\\.]+\\.", "");
+ }
+ }
+ return fqdn;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7ee66cd7/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java b/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java
index a642369..187b470 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java
@@ -20,6 +20,7 @@ package org.apache.slider.server.services.security;
import com.google.inject.Singleton;
import org.apache.commons.io.FileUtils;
import org.apache.slider.common.SliderKeys;
+import org.apache.slider.common.tools.SliderUtils;
import org.apache.slider.core.conf.MapOperations;
import org.apache.slider.core.exceptions.SliderException;
import org.slf4j.Logger;
@@ -473,10 +474,8 @@ public class CertificateManager {
private String getSubjectDN(String hostname, String containerId,
String appName) {
return String.format("/CN=%s%s%s",
- hostname,
+ SliderUtils.extractDomainNameFromFQDN(hostname),
containerId != null ? "/OU=" + containerId : "",
appName != null ? "/OU=" + appName : "");
-
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7ee66cd7/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java b/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
index deca7a8..7bf1906 100644
--- a/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
+++ b/slider-core/src/test/java/org/apache/slider/common/tools/TestSliderUtils.java
@@ -173,4 +173,25 @@ public class TestSliderUtils {
Assert.assertEquals("Should be null", msg,
SliderUtils.extractFirstLine(msg));
}
+
+ @Test
+ public void testExtractDomainNameFromFQDN() {
+ String fqdn = "azure-cluster-c0.k4kldeirxsoutbyybgqoiqdsgg.fx.cloudapp.net";
+ Assert.assertEquals("Returned domainname is incorrect",
+ "k4kldeirxsoutbyybgqoiqdsgg.fx.cloudapp.net",
+ SliderUtils.extractDomainNameFromFQDN(fqdn));
+ fqdn = "";
+ Assert.assertEquals("Returned domainname should be empty string", "",
+ SliderUtils.extractDomainNameFromFQDN(fqdn));
+ fqdn = null;
+ Assert.assertEquals("Returned domainname should be null", null,
+ SliderUtils.extractDomainNameFromFQDN(fqdn));
+ fqdn = "azure-cluster-c0";
+ Assert.assertEquals("Returned domainname should be same as fqdn",
+ "azure-cluster-c0", SliderUtils.extractDomainNameFromFQDN(fqdn));
+ // should handle whitespaces as well
+ fqdn = " www.example.com";
+ Assert.assertEquals("Returned domainname is incorrect", "example.com",
+ SliderUtils.extractDomainNameFromFQDN(fqdn));
+ }
}
[2/3] incubator-slider git commit: SLIDER-1259: use NM bind host and
address to define what the container should come up as. Issue: how do these
get set? That is: will they be in the configs
Posted by st...@apache.org.
SLIDER-1259: use NM bind host and address to define what the container should come up as. Issue: how do these get set? That is: will they be in the configs
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2ef2bd45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2ef2bd45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2ef2bd45
Branch: refs/heads/feature/SLIDER-1259-multihomed
Commit: 2ef2bd45983d516cb65f13a2e173338388b1855e
Parents: 7ee66cd
Author: Steve Loughran <st...@apache.org>
Authored: Wed Feb 14 17:26:34 2018 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Mar 5 13:02:34 2018 +0000
----------------------------------------------------------------------
.../org/apache/slider/server/appmaster/SliderAppMaster.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2ef2bd45/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index c12fae8..a56c141 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -1678,7 +1678,13 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
protobufRelay);
int port = getPortToRequest();
- InetSocketAddress rpcAddress = new InetSocketAddress("0.0.0.0", port);
+
+ // use the same host and address options as the NM
+ InetSocketAddress rpcAddress = getConfig().getSocketAddr(
+ YarnConfiguration.NM_BIND_HOST,
+ YarnConfiguration.NM_ADDRESS,
+ "0.0.0.0:" + port,
+ port);
rpcService =
new WorkflowRpcService("SliderRPC",
RpcBinder.createProtobufServer(rpcAddress, getConfig(),
[3/3] incubator-slider git commit: SLIDER-12159 multihoming -preserve
ports
Posted by st...@apache.org.
SLIDER-12159 multihoming -preserve ports
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4286d30c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4286d30c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4286d30c
Branch: refs/heads/feature/SLIDER-1259-multihomed
Commit: 4286d30c609ca18b1dedfa8a5588dd53761b91be
Parents: 2ef2bd4
Author: Steve Loughran <st...@apache.org>
Authored: Mon Mar 5 13:01:46 2018 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Mar 5 13:02:34 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4286d30c/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index a56c141..b416bed 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -1685,6 +1685,9 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
YarnConfiguration.NM_ADDRESS,
"0.0.0.0:" + port,
port);
+ // but force in the desired port, irrespective of the value
+ // in the configuration fields.
+ rpcAddress = new InetSocketAddress(rpcAddress.getAddress(), port);
rpcService =
new WorkflowRpcService("SliderRPC",
RpcBinder.createProtobufServer(rpcAddress, getConfig(),