Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw)

This commit is contained in:
Allen Wittenauer 2015-05-18 16:13:50 +00:00
parent d82222920e
commit 10c922b5c6
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dev-support/test-patch.sh
View File

@ -38,6 +38,7 @@ function setup_defaults
HOW_TO_CONTRIBUTE="https://wiki.apache.org/hadoop/HowToContribute" HOW_TO_CONTRIBUTE="https://wiki.apache.org/hadoop/HowToContribute"
JENKINS=false JENKINS=false
BASEDIR=$(pwd) BASEDIR=$(pwd)
RELOCATE_PATCH_DIR=false
FINDBUGS_HOME=${FINDBUGS_HOME:-} FINDBUGS_HOME=${FINDBUGS_HOME:-}
ECLIPSE_HOME=${ECLIPSE_HOME:-} ECLIPSE_HOME=${ECLIPSE_HOME:-}
@ -607,6 +608,7 @@ function hadoop_usage
echo "--eclipse-home=<path> Eclipse home directory (default ECLIPSE_HOME environment variable)" echo "--eclipse-home=<path> Eclipse home directory (default ECLIPSE_HOME environment variable)"
echo "--jira-cmd=<cmd> The 'jira' command to use (default 'jira')" echo "--jira-cmd=<cmd> The 'jira' command to use (default 'jira')"
echo "--jira-password=<pw> The password for the 'jira' command" echo "--jira-password=<pw> The password for the 'jira' command"
echo "--mv-patch-dir Move the patch-dir into the basedir during cleanup."
echo "--wget-cmd=<cmd> The 'wget' command to use (default 'wget')" echo "--wget-cmd=<cmd> The 'wget' command to use (default 'wget')"
} }
@ -692,6 +694,9 @@ function parse_args
--mvn-cmd=*) --mvn-cmd=*)
MVN=${i#*=} MVN=${i#*=}
;; ;;
--mv-patch-dir)
RELOCATE_PATCH_DIR=true;
;;
--offline) --offline)
OFFLINE=true OFFLINE=true
;; ;;
@ -2323,19 +2328,16 @@ function cleanup_and_exit
{ {
local result=$1 local result=$1
if [[ ${JENKINS} == "true" ]] ; then if [[ ${JENKINS} == "true" && ${RELOCATE_PATCH_DIR} == "true" && \
if [[ -e "${PATCH_DIR}" ]] ; then -e ${PATCH_DIR} && -d ${PATCH_DIR} ]] ; then
if [[ -d "${PATCH_DIR}" ]]; then # if PATCH_DIR is already inside BASEDIR, then
# if PATCH_DIR is already inside BASEDIR, then # there is no need to move it since we assume that
# there is no need to move it since we assume that # Jenkins or whatever already knows where it is at
# Jenkins or whatever already knows where it is at # since it told us to put it there!
# since it told us to put it there! relative_patchdir >/dev/null
relative_patchdir >/dev/null if [[ $? == 1 ]]; then
if [[ $? == 1 ]]; then hadoop_debug "mv ${PATCH_DIR} ${BASEDIR}"
hadoop_debug "mv ${PATCH_DIR} ${BASEDIR}" mv "${PATCH_DIR}" "${BASEDIR}"
mv "${PATCH_DIR}" "${BASEDIR}"
fi
fi
fi fi
fi fi
big_console_header "Finished build." big_console_header "Finished build."

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -107,6 +107,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11884. test-patch.sh should pull the real findbugs version HADOOP-11884. test-patch.sh should pull the real findbugs version
(Kengo Seki via aw) (Kengo Seki via aw)
HADOOP-11944. add option to test-patch to avoid relocating patch process
directory (Sean Busbey via aw)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp HADOOP-11785. Reduce the number of listStatus operation in distcp