Browse Source

AMBARI-12024. Error using Slider view with wire-encryption enabled (aonishuk)

Andrew Onishuk 10 năm trước cách đây
mục cha
commit
0e2a40c092

+ 2 - 0
ambari-server/conf/ambari-env.sh

@@ -15,3 +15,5 @@
 
 AMBARI_PID_DIR=/var/run/ambari-server
 AMBARI_PASSPHRASE="DEV"
+# to add additional directory or jar to server classpath use SERVER_CLASSPATH variable
+# export SERVER_CLASSPATH=/etc/hadoop/conf/secure

+ 3 - 1
ambari-server/conf/unix/ambari-env.sh

@@ -16,4 +16,6 @@
 
 AMBARI_PASSHPHRASE="DEV"
 export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m -Djava.security.auth.login.config=/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false'
-export PATH=$PATH:/var/lib/ambari-agent
+export PATH=$PATH:/var/lib/ambari-agent
+# to add additional directory or jar to server classpath use SERVER_CLASSPATH variable
+# export SERVER_CLASSPATH=/etc/hadoop/conf/secure

+ 4 - 0
ambari-server/src/main/python/ambari_server_main.py

@@ -95,6 +95,8 @@ SERVER_START_TIMEOUT = 10
 SERVER_PING_TIMEOUT_WINDOWS = 5
 SERVER_PING_ATTEMPTS_WINDOWS = 4
 
+SERVER_CLASSPATH_KEY = "SERVER_CLASSPATH"
+
 SERVER_SEARCH_PATTERN = "org.apache.ambari.server.controller.AmbariServer"
 
 EXITCODE_NAME = "ambari-server.exitcode"
@@ -319,6 +321,8 @@ def server_process_main(options, scmStatus=None):
 
   class_path = get_conf_dir()
   class_path = os.path.abspath(class_path) + os.pathsep + get_ambari_classpath()
+  if SERVER_CLASSPATH_KEY in os.environ:
+      class_path =  os.environ[SERVER_CLASSPATH_KEY] + os.pathsep + class_path
 
   debug_mode = get_debug_mode()
   debug_start = (debug_mode & 1) or SERVER_START_DEBUG