Skip to content

Remove direct usage of sun.misc.Signal #7144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions kyuubi-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@
<artifactId>kyuubi-relocated-hive-service-rpc</artifactId>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-relocated-util</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@

package org.apache.kyuubi.util

import java.util
import java.util.Collections

import scala.collection.JavaConverters._
import scala.collection.mutable

import org.apache.commons.lang3.SystemUtils
import org.slf4j.Logger
import sun.misc.{Signal, SignalHandler}

import org.apache.kyuubi.Logging
import org.apache.kyuubi.shaded.util.{Signal, SignalHandler}

object SignalRegister extends Logging {
private val handlers = new scala.collection.mutable.HashMap[String, ActionHandler]
private val handlers = new mutable.HashMap[String, ActionHandler]

def registerLogger(log: Logger): Unit = {
Seq("TERM", "HUP", "INT").foreach { sig =>
Expand All @@ -41,7 +43,7 @@ object SignalRegister extends Logging {
ActionHandler(signal)
})
handler.register({
log.error(s"RECEIVED SIGNAL ${signal.getNumber}: " + sig)
log.error(s"RECEIVED SIGNAL ${signal.getNumber}: $sig")
false
})
} catch {
Expand All @@ -52,7 +54,7 @@ object SignalRegister extends Logging {
}

case class ActionHandler(signal: Signal) extends SignalHandler {
private val actions = Collections.synchronizedList(new java.util.LinkedList[() => Boolean])
private val actions = Collections.synchronizedList(new util.LinkedList[() => Boolean])
private val prevHandler: SignalHandler = Signal.handle(signal, this)

override def handle(sig: Signal): Unit = {
Expand Down
5 changes: 5 additions & 0 deletions kyuubi-hive-beeline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-relocated-util</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

import java.sql.SQLException;
import java.sql.Statement;
import sun.misc.Signal;
import sun.misc.SignalHandler;
import org.apache.kyuubi.shaded.util.Signal;
import org.apache.kyuubi.shaded.util.SignalHandler;

public class SunSignalHandler implements BeeLineSignalHandler, SignalHandler {
private Statement stmt = null;
Expand Down
47 changes: 16 additions & 31 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@
</distributionManagement>

<properties>
<java.version>8</java.version>
<maven.version>3.9.10</maven.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<enforcer.maxJdkVersion>8</enforcer.maxJdkVersion>
<scala.version>2.12.19</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<scala-collection-compat.version>2.12.0</scala-collection-compat.version>
Expand Down Expand Up @@ -174,7 +174,7 @@
<junit.version>4.13.2</junit.version>
<kafka.version>3.5.2</kafka.version>
<kubernetes-client.version>6.13.5</kubernetes-client.version>
<kyuubi-relocated.version>0.5.0</kyuubi-relocated.version>
<kyuubi-relocated.version>0.6.0</kyuubi-relocated.version>
<kyuubi-relocated-zookeeper.artifacts>kyuubi-relocated-zookeeper-34</kyuubi-relocated-zookeeper.artifacts>
<ldapsdk.version>6.0.5</ldapsdk.version>
<log4j.version>2.24.3</log4j.version>
Expand Down Expand Up @@ -310,6 +310,11 @@
<artifactId>kyuubi-relocated-hive-service-rpc</artifactId>
<version>${kyuubi-relocated.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-relocated-util</artifactId>
<version>${kyuubi-relocated.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>${kyuubi-relocated-zookeeper.artifacts}</artifactId>
Expand Down Expand Up @@ -1891,7 +1896,8 @@
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${java.version}</maxJdkVersion>
<maxJdkVersion>${enforcer.maxJdkVersion}</maxJdkVersion>
<ignoredScopes>provided</ignoredScopes>
<ignoredScopes>test</ignoredScopes>
<ignoreClasses>
<!--
Expand Down Expand Up @@ -1935,7 +1941,6 @@
<jdk>8</jdk>
</activation>
<properties>
<java.version>8</java.version>
<!--
Iceberg drops support for Java 8 since 1.7.0.
And it may have compatible issue with Spark 3.5.4+, see Iceberg #11731
Expand All @@ -1945,30 +1950,12 @@
</profile>

<profile>
<id>java-11</id>
<activation>
<jdk>11</jdk>
</activation>
<properties>
<java.version>11</java.version>
<maven.compiler.source></maven.compiler.source>
<maven.compiler.target></maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<minimalJavaBuildVersion>${java.version}</minimalJavaBuildVersion>
</properties>
</profile>

<profile>
<id>java-17</id>
<id>jdk9+</id>
<activation>
<jdk>17</jdk>
<jdk>[9,)</jdk>
</activation>
<properties>
<java.version>17</java.version>
<maven.compiler.source></maven.compiler.source>
<maven.compiler.target></maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<minimalJavaBuildVersion>${java.version}</minimalJavaBuildVersion>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>

Expand All @@ -1978,10 +1965,6 @@
<jdk>21</jdk>
</activation>
<properties>
<java.version>21</java.version>
<maven.compiler.source></maven.compiler.source>
<maven.compiler.target></maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<!-- TODO: The current version of spotless(2.30.0) and google-java-format(1.7)
does not support Java 21, but new version produces different outputs.
Re-evaluate once we dropped support for Java 8. -->
Expand Down Expand Up @@ -2064,6 +2047,7 @@
<module>extensions/spark/kyuubi-spark-connector-hive</module>
</modules>
<properties>
<enforcer.maxJdkVersion>17</enforcer.maxJdkVersion>
<spark.version>4.0.0</spark.version>
<spark.binary.version>4.0</spark.binary.version>
<antlr4.version>4.13.1</antlr4.version>
Expand All @@ -2084,6 +2068,7 @@
<profile>
<id>spark-master</id>
<properties>
<enforcer.maxJdkVersion>17</enforcer.maxJdkVersion>
<spark.version>4.0.0-SNAPSHOT</spark.version>
<antlr4.version>4.13.1</antlr4.version>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.PySparkTest</maven.plugin.scalatest.exclude.tags>
Expand Down
Loading