[DRILL-7147] Source order of "drill-env.sh" and "distrib-env.sh" should be swapped

• Type: Bug
• Status: Resolved
• Priority: Minor
• Resolution: Not A Problem
• Affects Version/s: 1.15.0
• Fix Version/s: 1.16.0
• Component/s: Execution - Flow
• Assignee: Abhishek Girish
• Reporter: Hao Zhu
• Created: 01/Apr/19 21:10
• Updated: 02/Apr/19 16:30
• Resolved: 01/Apr/19 23:58

Description

In bin/drill-config.sh, the description of the source order is:

# Variables may be set in one of four places:
#
#   Environment (per run)
#   drill-env.sh (per site)
#   distrib-env.sh (per distribution)
#   drill-config.sh (this file, Drill defaults)
#
# Properties "inherit" from items lower on the list, and may be "overridden" by items
# higher on the list. In the environment, just set the variable:

However actually bin/drill-config.sh sources drill-env.sh firstly, and then distrib-env.sh.

drillEnv="$DRILL_CONF_DIR/drill-env.sh"
if [ -r "$drillEnv" ]; then
  . "$drillEnv"
fi
...

distribEnv="$DRILL_CONF_DIR/distrib-env.sh"
if [ -r "$distribEnv" ]; then
  . "$distribEnv"
else
  distribEnv="$DRILL_HOME/conf/distrib-env.sh"
  if [ -r "$distribEnv" ]; then
    . "$distribEnv"
  fi
fi

We need to swap the source order of drill-env.sh and distrib-env.sh.

Issue Links

• links to: GitHub Pull Request #1724