[FLINK-8091] [scripts] Support running historyserver in foreground

This closes apache#5642

docs/monitoring/historyserver.md

@@ -37,7 +37,7 @@ After you have configured the HistoryServer *and* JobManager, you start and stop
 
 ```sh
 # Start or stop the HistoryServer
-bin/historyserver.sh (start|stop)
+bin/historyserver.sh (start|start-foreground|stop)
 ```
 
 By default, this server binds to `localhost` and listens at port `8082`.

flink-dist/src/main/flink-bin/bin/flink-console.sh

@@ -19,7 +19,7 @@
 
 # Start a Flink service as a console application. Must be stopped with Ctrl-C
 # or with SIGTERM by kill or the controlling process.
-USAGE="Usage: flink-console.sh (jobmanager|taskmanager|zookeeper) [args]"
+USAGE="Usage: flink-console.sh (jobmanager|taskmanager|historyserver|zookeeper) [args]"
 
 SERVICE=$1
 ARGS=("${@:2}") # get remaining arguments as array
@@ -42,6 +42,10 @@ case $SERVICE in
  CLASS_TO_RUN=org.apache.flink.runtime.taskexecutor.TaskManagerRunner
  ;;
 
+ (historyserver)
+ CLASS_TO_RUN=org.apache.flink.runtime.webmonitor.history.HistoryServer
+ ;;
+
  (zookeeper)
  CLASS_TO_RUN=org.apache.flink.runtime.zookeeper.FlinkZooKeeperQuorumPeer
  ;;

flink-dist/src/main/flink-bin/bin/historyserver.sh

@@ -18,7 +18,7 @@
 ################################################################################
 
 # Start/stop a Flink HistoryServer
-USAGE="Usage: historyserver.sh (start|stop)"
+USAGE="Usage: historyserver.sh (start|start-foreground|stop)"
 
 STARTSTOP=$1
 
@@ -27,8 +27,12 @@ bin=`cd "$bin"; pwd`
 
 . "$bin"/config.sh
 
-if [[ $STARTSTOP == "start" ]]; then
+if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
  args=("--configDir" "${FLINK_CONF_DIR}")
 fi
 
-"${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP historyserver "${args[@]}"
+if [[ $STARTSTOP == "start-foreground" ]]; then
+ exec "${FLINK_BIN_DIR}"/flink-console.sh historyserver "${args[@]}"
+else
+ "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP historyserver "${args[@]}"
+fi