diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index de3f926161..657b4414dc 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -94,6 +94,8 @@ Trunk (Unreleased) MAPREDUCE-6013. [post-HADOOP-9902] mapred version is missing (Akira AJISAKA via aw) + MAPREDUCE-6250. deprecate sbin/mr-jobhistory-daemon.sh (aw) + BUG FIXES MAPREDUCE-6191. Improve clearing stale state of Java serialization diff --git a/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh b/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh index 7f6e6f1db6..abc70d9736 100644 --- a/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh +++ b/hadoop-mapreduce-project/bin/mr-jobhistory-daemon.sh @@ -42,5 +42,8 @@ fi daemonmode=$1 shift +hadoop_error "WARNING: Use of this script to ${daemonmode} the MR JobHistory daemon is deprecated." +hadoop_error "WARNING: Attempting to execute replacement \"mapred --daemon ${daemonmode}\" instead." + exec "${HADOOP_MAPRED_HOME}/bin/mapred" \ --config "${HADOOP_CONF_DIR}" --daemon "${daemonmode}" "$@"