Backport "HBASE-28807 Remove some useless code and add some logs for CanaryTool" to branch-3

.asf.yaml

@@ -38,4 +38,4 @@ notifications:
   commits:      [email protected]
   issues:       [email protected]
   pullrequests: [email protected]
-  jira_options: link
+  jira_options: link label

README.md

@@ -28,6 +28,8 @@ The latest HBase can be downloaded from the [download page](https://hbase.apache
 
 We use mailing lists to send notice and discuss. The mailing lists and archives are listed [here](http://hbase.apache.org/mail-lists.html)
 
+We use the #hbase channel on the official [ASF Slack Workspace](https://the-asf.slack.com/) for real time questions and discussions. Please mail [email protected] to request an invite.
+
 # How to Contribute
 The source code can be found at https://hbase.apache.org/source-repository.html
 

bin/draining_servers.rb

@@ -25,7 +25,6 @@
 
 java_import org.apache.hadoop.hbase.HBaseConfiguration
 java_import org.apache.hadoop.hbase.client.ConnectionFactory
-java_import org.apache.hadoop.hbase.client.HBaseAdmin
 java_import org.apache.hadoop.hbase.zookeeper.ZKUtil
 java_import org.apache.hadoop.hbase.zookeeper.ZNodePaths
 java_import org.slf4j.LoggerFactory
@@ -136,8 +135,12 @@ def listServers(_options)
 
 hostOrServers = ARGV[1..ARGV.size]
 
-# Create a logger and save it to ruby global
-$LOG = LoggerFactory.getLogger(NAME)
+# disable debug/info logging on this script for clarity
+log_level = 'ERROR'
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop.hbase', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.zookeeper', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop', log_level)
+
 case ARGV[0]
 when 'add'
   if ARGV.length < 2

bin/get-active-master.rb

@@ -24,9 +24,10 @@
 java_import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker
 
 # disable debug/info logging on this script for clarity
-log_level = org.apache.log4j.Level::ERROR
-org.apache.log4j.Logger.getLogger('org.apache.hadoop.hbase').setLevel(log_level)
-org.apache.log4j.Logger.getLogger('org.apache.zookeeper').setLevel(log_level)
+log_level = 'ERROR'
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop.hbase', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.zookeeper', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop', log_level)
 
 config = HBaseConfiguration.create
 

bin/hbase

@@ -158,15 +158,7 @@ fi
 # establish a default value for HBASE_OPTS if it's not already set. For now,
 # all we set is the garbage collector.
 if [ -z "${HBASE_OPTS}" ] ; then
-  major_version_number="$(parse_java_major_version "$(read_java_version)")"
-  case "$major_version_number" in
-  8|9|10)
-    HBASE_OPTS="-XX:+UseConcMarkSweepGC"
-    ;;
-  11|*)
-    HBASE_OPTS="-XX:+UseG1GC"
-    ;;
-  esac
+  HBASE_OPTS="-XX:+UseG1GC"
   export HBASE_OPTS
 fi
 
@@ -487,16 +479,22 @@ add_maven_deps_to_classpath() {
   CLASSPATH=${CLASSPATH}:$(cat "${f}")
 }
 
-add_jdk11_deps_to_classpath() {
-  for f in ${HBASE_HOME}/lib/jdk11/*; do
-    if [ -f "${f}" ]; then
-      CLASSPATH="${CLASSPATH}:${f}"
-    fi
-  done
-}
-
-add_jdk11_jvm_flags() {
-  HBASE_OPTS="$HBASE_OPTS -Dorg.apache.hbase.thirdparty.io.netty.tryReflectionSetAccessible=true --add-modules jdk.unsupported --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED"
+add_jdk17_jvm_flags() {
+  # Keep in sync with hbase-surefire.jdk17.flags in the root pom.xml
+  HBASE_OPTS="$HBASE_OPTS -Dorg.apache.hbase.thirdparty.io.netty.tryReflectionSetAccessible=true"
+  HBASE_OPTS="$HBASE_OPTS --add-modules jdk.unsupported"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/java.io=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/java.nio=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/sun.nio.ch=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/java.lang=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/jdk.internal.ref=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/java.lang.reflect=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/java.util=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-opens java.base/java.util.concurrent=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-exports java.base/jdk.internal.misc=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-exports java.base/sun.net.dns=ALL-UNNAMED"
+  HBASE_OPTS="$HBASE_OPTS --add-exports java.base/sun.net.util=ALL-UNNAMED"
 }
 
 add_opentelemetry_agent() {
@@ -565,12 +563,6 @@ if [ "$COMMAND" = "shell" ] ; then
   fi
   HBASE_OPTS="$HBASE_OPTS $HBASE_SHELL_OPTS"
 elif [ "$COMMAND" = 'jshell' ] ; then
-  java_version="$(read_java_version)"
-  major_version_number="$(parse_java_major_version "${java_version}")"
-  if [ "${major_version_number}" -lt 9 ] ; then
-    echo "JShell is available only with JDK9 and lated. Detected JDK version is ${java_version}".
-    exit 1
-  fi
   CLASS='jdk.internal.jshell.tool.JShellToolProvider'
   # set default values for HBASE_JSHELL_ARGS
   read -r -a JSHELL_ARGS <<< "${HBASE_JSHELL_ARGS:-"--startup DEFAULT --startup PRINTING --startup ${HBASE_HOME}/bin/hbase_startup.jsh"}"
@@ -771,7 +763,7 @@ elif [ "$COMMAND" = "hbtop" ] ; then
 elif [ "$COMMAND" = "credential" ] ; then
   CLASS='org.apache.hadoop.security.alias.CredentialShell'
 elif [ "$COMMAND" = "copyreppeers" ] ; then
-  CLASS='org.apache.hadoop.hbase.replication.ReplicationPeerMigrationTool'
+  CLASS='org.apache.hadoop.hbase.replication.CopyReplicationPeers'
 else
   CLASS=$COMMAND
 if [[ "$CLASS" =~ .*IntegrationTest.* ]] ; then
@@ -783,59 +775,9 @@ if [[ "$CLASS" =~ .*IntegrationTest.* ]] ; then
   fi
 fi
 
-# Add lib/jdk11 jars to the classpath
-
+add_jdk17_jvm_flags
 if [ "${DEBUG}" = "true" ]; then
-  echo "Deciding on addition of lib/jdk11 jars to the classpath"
-fi
-
-addJDK11Jars=false
-
-if [ "${HBASE_JDK11}" != "" ]; then
-  # Use the passed Environment Variable HBASE_JDK11
-  if [ "${HBASE_JDK11}" = "include" ]; then
-    addJDK11Jars=true
-    if [ "${DEBUG}" = "true" ]; then
-      echo "HBASE_JDK11 set as 'include' hence adding JDK11 jars to classpath."
-    fi
-  elif [ "${HBASE_JDK11}" = "exclude" ]; then
-    if [ "${DEBUG}" = "true" ]; then
-      echo "HBASE_JDK11 set as 'exclude' hence skipping JDK11 jars to classpath."
-    fi
-  else
-    echo "[HBASE_JDK11] contains unsupported value(s) - ${HBASE_JDK11}. Ignoring passed value."
-    echo "[HBASE_JDK11] supported values: [include, exclude]."
-  fi
-else
-  # Use JDK detection
-  version="$(read_java_version)"
-  major_version_number="$(parse_java_major_version "$version")"
-
-  if [ "${DEBUG}" = "true" ]; then
-    echo "HBASE_JDK11 not set hence using JDK detection."
-    echo "Extracted JDK version - ${version}, major_version_number - ${major_version_number}"
-  fi
-
-  if [[ "$major_version_number" -ge "11" ]]; then
-    if [ "${DEBUG}" = "true" ]; then
-      echo "Version ${version} is greater-than/equal to 11 hence adding JDK11 jars to classpath."
-    fi
-    addJDK11Jars=true
-  elif [ "${DEBUG}" = "true" ]; then
-      echo "Version ${version} is lesser than 11 hence skipping JDK11 jars from classpath."
-  fi
-fi
-
-if [ "${addJDK11Jars}" = "true" ]; then
-  add_jdk11_deps_to_classpath
-  add_jdk11_jvm_flags
-  if [ "${DEBUG}" = "true" ]; then
-     echo "Added JDK11 jars to classpath."
-     echo "Added JDK11 JVM flags too."
-  fi
-elif [ "${DEBUG}" = "true" ]; then
-  echo "JDK11 jars skipped from classpath."
-  echo "Skipped adding JDK11 JVM flags."
+  echo "Added JDK17 JVM flags."
 fi
 
 if [[ "${HBASE_OTEL_TRACING_ENABLED:-false}" = "true" ]] ; then
@@ -879,6 +821,7 @@ export CLASSPATH
 if [ "${DEBUG}" = "true" ]; then
   echo "classpath=${CLASSPATH}" >&2
   HBASE_OPTS="${HBASE_OPTS} -Xdiag"
+  echo "HBASE_OPTS=${HBASE_OPTS}"
 fi
 
 # resolve the command arguments

bin/hbase-config.sh

@@ -164,22 +164,26 @@ export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
 
 # Now having JAVA_HOME defined is required
 if [ -z "$JAVA_HOME" ]; then
-    cat 1>&2 <<EOF
+  cat 1>&2 <<EOF
 +======================================================================+
 |                    Error: JAVA_HOME is not set                       |
 +----------------------------------------------------------------------+
 | Please download the latest Sun JDK from the Sun Java web site        |
 |     > http://www.oracle.com/technetwork/java/javase/downloads        |
 |                                                                      |
-| HBase requires Java 1.8 or later.                                    |
+| HBase requires Java 17 or later.                                    |
 +======================================================================+
 EOF
-    exit 1
+  exit 1
 fi
 
 function read_java_version() {
-  properties="$("${JAVA_HOME}/bin/java" -XshowSettings:properties -version 2>&1)"
-  echo "${properties}" | "${GREP}" java.runtime.version | head -1 | "${SED}" -e 's/.* = \([^ ]*\)/\1/'
+  # Avoid calling java repeatedly
+  if [ -z "$read_java_version_cached" ]; then
+    properties="$("${JAVA_HOME}/bin/java" -XshowSettings:properties -version 2>&1)"
+    read_java_version_cached="$(echo "${properties}" | "${GREP}" java.runtime.version | head -1 | "${SED}" -e 's/.* = \([^ ]*\)/\1/')"
+  fi
+  echo "$read_java_version_cached"
 }
 
 # Inspect the system properties exposed by this JVM to identify the major
@@ -199,3 +203,11 @@ function parse_java_major_version() {
     ;;
   esac
 }
+
+# test whether we are on jdk17 or above
+java_version="$(read_java_version)"
+major_version_number="$(parse_java_major_version "$java_version")"
+if [ "${major_version_number}" -lt 17 ] ; then
+  echo "HBase can only be run on JDK17 and later. Detected JDK version is ${java_version}".
+  exit 1
+fi

bin/replication/copy_tables_desc.rb

@@ -27,11 +27,8 @@
 java_import org.apache.hadoop.conf.Configuration
 java_import org.apache.hadoop.hbase.HBaseConfiguration
 java_import org.apache.hadoop.hbase.HConstants
-java_import org.apache.hadoop.hbase.HTableDescriptor
 java_import org.apache.hadoop.hbase.TableName
 java_import org.apache.hadoop.hbase.client.ConnectionFactory
-java_import org.apache.hadoop.hbase.client.HBaseAdmin
-java_import org.slf4j.LoggerFactory
 
 # Name of this script
 NAME = 'copy_tables_desc'.freeze
@@ -45,7 +42,7 @@ def usage
 def copy(src, dst, table)
   # verify if table exists in source cluster
   begin
-    t = src.getTableDescriptor(TableName.valueOf(table))
+    t = src.getDescriptor(TableName.valueOf(table))
   rescue org.apache.hadoop.hbase.TableNotFoundException
     puts format("Source table \"%s\" doesn't exist, skipping.", table)
     return
@@ -62,9 +59,13 @@ def copy(src, dst, table)
   puts format('Schema for table "%s" was succesfully copied to remote cluster.', table)
 end
 
-usage if ARGV.size < 2 || ARGV.size > 3
+# disable debug/info logging on this script for clarity
+log_level = 'ERROR'
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop.hbase', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.zookeeper', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop', log_level)
 
-LOG = LoggerFactory.getLogger(NAME)
+usage if ARGV.size < 2 || ARGV.size > 3
 
 parts1 = ARGV[0].split(':')
 

bin/shutdown_regionserver.rb

@@ -24,7 +24,6 @@
 
 include Java
 java_import org.apache.hadoop.hbase.HBaseConfiguration
-java_import org.apache.hadoop.hbase.client.HBaseAdmin
 java_import org.apache.hadoop.hbase.client.ConnectionFactory
 
 def usage(msg = nil)
@@ -35,6 +34,12 @@ def usage(msg = nil)
   abort
 end
 
+# disable debug/info logging on this script for clarity
+log_level = 'ERROR'
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop.hbase', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.zookeeper', log_level)
+org.apache.hadoop.hbase.logging.Log4jUtils.setAllLevels('org.apache.hadoop', log_level)
+
 usage if ARGV.empty?
 
 ARGV.each do |x|