-
Notifications
You must be signed in to change notification settings - Fork 379
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
### What changes were proposed in this pull request? Split IcebergRESTService into one separate module, it could be managed with or without Gravitino server. #### For user 1. provide an isolated Iceberg REST server package or Gravitino package with directory `iceberg-rest-server` which contains Iceberg REST server. They both contain isolated config files and start&stop script. 2. The configuration items start with `gravitino.iceberg-rest.` are treated as Iceberg REST server configs. like `gravitino.iceberg-rest.catalog-backend`, `gravitino.iceberg-rest.httpPort`, etc. Configurations for Iceberg REST server are same in isolated package and Gravitino package. #### For developer The core is `RESTService` which start JettyServer for Iceberg REST server, * For isolated Iceberg REST server module, the entrypoint is `IcebergRESTServer` which provides configuration, metricsSystem for `RESTService`. * For GravitinoServer, `RESTService` is managed as a AuxiliaryService. ### Why are the changes needed? Iceberg rest service is managed as an auxiliary service in Gravitino server , for the users who want to use Iceberg REST service only, it introduces an extra burden. Fix: #2730 ### Does this PR introduce _any_ user-facing change? yes, will add document in #4113 ### How was this patch tested? 1. existing tests 2. test in local env as a Iceberg REST server ### related docs https://docs.google.com/document/d/1lyJwMaaJKfMqtnH9c7LwvnOHRKm7gh8Al4Sw3T1DFjM/edit
- Loading branch information
Showing
87 changed files
with
1,710 additions
and
501 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,206 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| # | ||
| #set -ex | ||
| USAGE="-e Usage: bin/gravitino-iceberg-rest-server.sh [--config <conf-dir>]\n\t | ||
| {start|run|stop|restart|status}" | ||
|
|
||
| if [[ "$1" == "--config" ]]; then | ||
| shift | ||
| conf_dir="$1" | ||
| if [[ ! -d "${conf_dir}" ]]; then | ||
| echo "ERROR : ${conf_dir} is not a directory" | ||
| echo ${USAGE} | ||
| exit 1 | ||
| else | ||
| export GRAVITINO_CONF_DIR="${conf_dir}" | ||
| fi | ||
| shift | ||
| fi | ||
|
|
||
| bin="$(dirname "${BASH_SOURCE-$0}")" | ||
| bin="$(cd "${bin}">/dev/null; pwd)" | ||
|
|
||
| . "${bin}/common.sh" | ||
|
|
||
| check_java_version | ||
|
|
||
| function check_process_status() { | ||
| local pid=$(found_iceberg_rest_server_pid) | ||
|
|
||
| if [[ -z "${pid}" ]]; then | ||
| echo "GravitinoIcebergRESTServer is not running" | ||
| else | ||
| echo "GravitinoIcebergRESTServer is running[PID:$pid]" | ||
| fi | ||
| } | ||
|
|
||
| function found_iceberg_rest_server_pid() { | ||
| process_name='GravitinoIcebergRESTServer'; | ||
| RUNNING_PIDS=$(ps x | grep ${process_name} | grep -v grep | awk '{print $1}'); | ||
|
|
||
| if [[ -z "${RUNNING_PIDS}" ]]; then | ||
| return | ||
| fi | ||
|
|
||
| if ! kill -0 ${RUNNING_PIDS} > /dev/null 2>&1; then | ||
| echo "GravitinoIcebergRESTServer running but process is dead" | ||
| fi | ||
|
|
||
| echo "${RUNNING_PIDS}" | ||
| } | ||
|
|
||
| function wait_for_iceberg_rest_server_to_die() { | ||
| timeout=10 | ||
| timeoutTime=$(date "+%s") | ||
| let "timeoutTime+=$timeout" | ||
| currentTime=$(date "+%s") | ||
| forceKill=1 | ||
|
|
||
| while [[ $currentTime -lt $timeoutTime ]]; do | ||
| local pid=$(found_iceberg_rest_server_pid) | ||
| if [[ -z "${pid}" ]]; then | ||
| forceKill=0 | ||
| break | ||
| fi | ||
|
|
||
| $(kill ${pid} > /dev/null 2> /dev/null) | ||
| if kill -0 ${pid} > /dev/null 2>&1; then | ||
| sleep 3 | ||
| else | ||
| forceKill=0 | ||
| break | ||
| fi | ||
| currentTime=$(date "+%s") | ||
| done | ||
|
|
||
| if [[ forceKill -ne 0 ]]; then | ||
| $(kill -9 ${pid} > /dev/null 2> /dev/null) | ||
| fi | ||
| } | ||
|
|
||
| function start() { | ||
| local pid=$(found_iceberg_rest_server_pid) | ||
|
|
||
| if [[ ! -z "${pid}" ]]; then | ||
| if kill -0 ${pid} >/dev/null 2>&1; then | ||
| echo "GravitinoIcebergRESTServer is already running" | ||
| return 0; | ||
| fi | ||
| fi | ||
|
|
||
| if [[ ! -d "${GRAVITINO_LOG_DIR}" ]]; then | ||
| echo "Log dir doesn't exist, create ${GRAVITINO_LOG_DIR}" | ||
| mkdir -p "${GRAVITINO_LOG_DIR}" | ||
| fi | ||
|
|
||
| nohup ${JAVA_RUNNER} ${JAVA_OPTS} ${GRAVITINO_DEBUG_OPTS} -cp ${GRAVITINO_CLASSPATH} ${GRAVITINO_SERVER_NAME} >> "${GRAVITINO_OUTFILE}" 2>&1 & | ||
|
|
||
| pid=$! | ||
| if [[ -z "${pid}" ]]; then | ||
| echo "GravitinoIcebergRESTServer start error!" | ||
| return 1; | ||
| else | ||
| echo "GravitinoIcebergRESTServer start success!" | ||
| fi | ||
|
|
||
| sleep 2 | ||
| check_process_status | ||
| } | ||
|
|
||
| function run() { | ||
| ${JAVA_RUNNER} ${JAVA_OPTS} ${GRAVITINO_DEBUG_OPTS} -cp ${GRAVITINO_CLASSPATH} ${GRAVITINO_SERVER_NAME} | ||
| } | ||
|
|
||
| function stop() { | ||
| local pid | ||
|
|
||
| pid=$(found_iceberg_rest_server_pid) | ||
|
|
||
| if [[ -z "${pid}" ]]; then | ||
| echo "GravitinoIcebergRESTServer is not running" | ||
| else | ||
| wait_for_iceberg_rest_server_to_die | ||
| echo "GravitinoIcebergRESTServer stop" | ||
| fi | ||
| } | ||
|
|
||
| HOSTNAME=$(hostname) | ||
| GRAVITINO_OUTFILE="${GRAVITINO_LOG_DIR}/gravitino-iceberg-rest-server.out" | ||
| GRAVITINO_SERVER_NAME=org.apache.gravitino.iceberg.server.GravitinoIcebergRESTServer | ||
| GRAVITINO_SIMPLE_SERVER_NAME=gravitino-iceberg-rest-server | ||
|
|
||
| JAVA_OPTS+=" -Dfile.encoding=UTF-8" | ||
| JAVA_OPTS+=" -Dlog4j2.configurationFile=file://${GRAVITINO_CONF_DIR}/log4j2.properties" | ||
| JAVA_OPTS+=" -Dgravitino.log.path=${GRAVITINO_LOG_DIR} ${GRAVITINO_MEM}" | ||
| JAVA_OPTS+=" -Dgravitino.server.name=${GRAVITINO_SIMPLE_SERVER_NAME}" | ||
| if [ "$JVM_VERSION" -eq 17 ]; then | ||
| JAVA_OPTS+=" -XX:+IgnoreUnrecognizedVMOptions" | ||
| JAVA_OPTS+=" --add-opens java.base/java.io=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.lang.invoke=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.lang.reflect=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.lang=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.math=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.net=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.nio=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.text=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.time=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.util.concurrent=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.util.regex=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/java.util=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/jdk.internal.ref=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.sql/java.sql=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/sun.util.calendar=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/sun.nio.ch=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/sun.nio.cs=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/sun.security.action=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.base/sun.util.calendar=ALL-UNNAMED" | ||
| JAVA_OPTS+=" --add-opens java.security.jgss/sun.security.krb5=ALL-UNNAMED" | ||
| fi | ||
|
|
||
| #JAVA_OPTS+=" -Djava.securit.krb5.conf=/etc/krb5.conf" | ||
|
|
||
| if [ -d "${GRAVITINO_HOME}/iceberg-rest-server/libs" ]; then | ||
| addJarInDir "${GRAVITINO_HOME}/iceberg-rest-server/libs" | ||
| else | ||
| addJarInDir "${GRAVITINO_HOME}/libs" | ||
| fi | ||
|
|
||
| case "${1}" in | ||
| start) | ||
| start | ||
| ;; | ||
| run) | ||
| run | ||
| ;; | ||
| stop) | ||
| stop | ||
| ;; | ||
| restart) | ||
| stop | ||
| start | ||
| ;; | ||
| status) | ||
| check_process_status | ||
| ;; | ||
| *) | ||
| echo ${USAGE} | ||
| esac |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.