You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2021/12/01 03:26:53 UTC
[bigtop] branch master updated: BIGTOP-3597. Fix build failure of Hadoop 3.2 against ZooKeeper 3.5. (#828)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new c1c4a44 BIGTOP-3597. Fix build failure of Hadoop 3.2 against ZooKeeper 3.5. (#828)
c1c4a44 is described below
commit c1c4a44f41cbbea79e75c3d1288afab6ab9ecf21
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Wed Dec 1 12:26:47 2021 +0900
BIGTOP-3597. Fix build failure of Hadoop 3.2 against ZooKeeper 3.5. (#828)
I merged this. Thanks, @elukey.
---
.../src/common/hadoop/patch11-YARN-9783.diff | 58 ++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/bigtop-packages/src/common/hadoop/patch11-YARN-9783.diff b/bigtop-packages/src/common/hadoop/patch11-YARN-9783.diff
new file mode 100644
index 0000000..ac5fe42
--- /dev/null
+++ b/bigtop-packages/src/common/hadoop/patch11-YARN-9783.diff
@@ -0,0 +1,58 @@
+qdiff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java
+index 9d5848ea034..27d32ea9d26 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java
+@@ -24,16 +24,12 @@
+ import org.apache.hadoop.registry.client.impl.zk.CuratorService;
+ import org.apache.hadoop.registry.client.impl.zk.RegistrySecurity;
+ import org.apache.zookeeper.CreateMode;
+-import org.apache.zookeeper.Login;
+-import org.apache.zookeeper.server.ZooKeeperSaslServer;
+-import org.apache.zookeeper.server.auth.SaslServerCallbackHandler;
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.Test;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
+-import javax.security.auth.login.AppConfigurationEntry;
+ import javax.security.auth.login.LoginContext;
+
+ import static org.apache.hadoop.registry.client.api.RegistryConstants.*;
+@@ -58,36 +54,6 @@ public void afterTestSecureZKService() throws Throwable {
+ RegistrySecurity.clearZKSaslClientProperties();
+ }
+
+- /**
+- * this is a cut and paste of some of the ZK internal code that was
+- * failing on windows and swallowing its exceptions
+- */
+- @Test
+- public void testLowlevelZKSaslLogin() throws Throwable {
+- RegistrySecurity.bindZKToServerJAASContext(ZOOKEEPER_SERVER_CONTEXT);
+- String serverSection =
+- System.getProperty(ZooKeeperSaslServer.LOGIN_CONTEXT_NAME_KEY,
+- ZooKeeperSaslServer.DEFAULT_LOGIN_CONTEXT_NAME);
+- assertEquals(ZOOKEEPER_SERVER_CONTEXT, serverSection);
+-
+- AppConfigurationEntry entries[];
+- entries = javax.security.auth.login.Configuration.getConfiguration()
+- .getAppConfigurationEntry(
+- serverSection);
+-
+- assertNotNull("null entries", entries);
+-
+- SaslServerCallbackHandler saslServerCallbackHandler =
+- new SaslServerCallbackHandler(
+- javax.security.auth.login.Configuration.getConfiguration());
+- Login login = new Login(serverSection, saslServerCallbackHandler);
+- try {
+- login.startThreadIfNeeded();
+- } finally {
+- login.shutdown();
+- }
+- }
+-
+ @Test
+ public void testCreateSecureZK() throws Throwable {
+ startSecureZK();