PHOENIX-7477 Set java.util.logging.config.class in scripts (#2040)

and add org.slf4:jul-to-slf4j to classpath where needed
apache · Jan 14, 2025 · 0dda95a · 0dda95a
1 parent 9af06d8
commit 0dda95a
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 4 deletions.
diff --git a/bin/performance.py b/bin/performance.py
@@ -65,7 +65,9 @@ def createFileWithContent(filename, content):
 
 java_cmd = phoenix_utils.java
 
-execute = ('%s %s $PHOENIX_OPTS -cp "%s%s%s%s%s"-Dlog4j2.configurationFile=file:' +
+execute = ('%s %s $PHOENIX_OPTS -cp "%s%s%s%s%s"' +
+           ' -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' +
+           ' -Dlog4j2.configurationFile=file:' +
            os.path.join(phoenix_utils.current_dir, "log4j2.properties") +
            ' org.apache.phoenix.util.PhoenixRuntime -t %s %s ') % \
     (java_cmd, phoenix_utils.jvm_module_flags, hbase_config_path, os.pathsep,

diff --git a/bin/pherf-standalone.py b/bin/pherf-standalone.py
@@ -38,7 +38,8 @@
     phoenix_utils.logging_jar + os.pathsep + \
     phoenix_utils.phoenix_client_embedded_jar + os.pathsep +\
     phoenix_utils.phoenix_pherf_jar + \
-    '" -Dlog4j2.configurationFile=file:' + \
+    '" -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' +\
+    ' -Dlog4j2.configurationFile=file:' + \
     os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
     " org.apache.phoenix.pherf.Pherf " + args 
 

diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
@@ -87,6 +87,7 @@ def setPath():
     LOGGING_JAR_PATTERN = "log4j-core*.jar"
     LOGGING_JAR_PATTERN2 = "log4j-api*.jar"
     LOGGING_JAR_PATTERN3 = "log4j-1.2-api*.jar"
+    LOGGING_JAR_PATTERN4 = "jul-to-slf4j*.jar"
     SQLLINE_WITH_DEPS_PATTERN = "sqlline-*-jar-with-dependencies.jar"
 
 
@@ -200,6 +201,7 @@ def setPath():
         logging_jar = findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN, os.path.join(current_dir, "..","lib"))
         logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN2, os.path.join(current_dir, "..","lib"))
         logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN3, os.path.join(current_dir, "..","lib"))
+        logging_jar += ":"+findFileInPathWithoutRecursion(LOGGING_JAR_PATTERN4, os.path.join(current_dir, "..","lib"))
 
     __set_java_home()
     __set_jvm_flags()

diff --git a/bin/psql.py b/bin/psql.py
@@ -34,7 +34,9 @@
     ' -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.hadoop_conf + \
     os.pathsep + phoenix_utils.slf4j_backend_jar + \
     os.pathsep + phoenix_utils.logging_jar + \
-    os.pathsep + phoenix_utils.phoenix_client_embedded_jar + '" -Dlog4j2.configurationFile=file:' + \
+    os.pathsep + phoenix_utils.phoenix_client_embedded_jar + \
+    '" -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' + \
+    ' -Dlog4j2.configurationFile=file:' + \
     os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
     " org.apache.phoenix.util.PhoenixRuntime " + args 
 

diff --git a/bin/sqlline.py b/bin/sqlline.py
@@ -97,7 +97,8 @@ def kill_child():
     phoenix_utils.slf4j_backend_jar + os.pathsep + \
     phoenix_utils.logging_jar + os.pathsep + \
     phoenix_utils.phoenix_client_lite_jar + \
-    '" -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
+    '" -Djava.util.logging.config.class=org.apache.hadoop.hbase.logging.JulToSlf4jInitializer ' + \
+    ' -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
     disable_jna + \
     " sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver" + \
     (not args.noconnect and " -u " + phoenix_utils.shell_quote([jdbc_url]) or "") + \

diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -24,6 +24,7 @@
       <outputDirectory>/lib</outputDirectory>
       <includes>
         <include>sqlline:sqlline:jar:jar-with-dependencies</include>
+        <include>org.slf4j:jul-to-slf4j</include>
         <include>org.apache.logging.log4j:log4j-slf4j-impl</include>
         <include>org.apache.logging.log4j:log4j-api</include>
         <include>org.apache.logging.log4j:log4j-core</include>

diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
@@ -151,6 +151,10 @@
             </goals>
             <configuration>
               <artifactItems>
+                <artifactItem>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>jul-to-slf4j</artifactId>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.logging.log4j</groupId>
                   <artifactId>log4j-api</artifactId>

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
@@ -105,6 +105,9 @@
                         <ignoredUnusedDeclaredDependency>
                             org.apache.logging.log4j:log4j-1.2-api
                         </ignoredUnusedDeclaredDependency>
+                        <ignoredUnusedDeclaredDependency>
+                            org.slf4j:jul-to-slf4j
+                        </ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                     <ignoredUsedUndeclaredDependencies>
                     </ignoredUsedUndeclaredDependencies>
@@ -462,6 +465,11 @@
 	</dependency>
 
         <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>

diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
@@ -161,6 +161,11 @@
     </dependency>
 
     <!-- Test Dependencies -->
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <scope>test</scope>
+    </dependency>
     <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
@@ -311,6 +316,9 @@
             <ignoredUnusedDeclaredDependency>
               org.apache.logging.log4j:log4j-1.2-api
             </ignoredUnusedDeclaredDependency>
+            <ignoredUnusedDeclaredDependency>
+              org.slf4j:jul-to-slf4j
+            </ignoredUnusedDeclaredDependency>
           </ignoredUnusedDeclaredDependencies>
           <ignoredUsedUndeclaredDependencies>
             <ignoredUsedUndeclaredDependency>

diff --git a/pom.xml b/pom.xml
@@ -1799,6 +1799,11 @@
         <artifactId>slf4j-reload4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId> jul-to-slf4j </artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>