HDFS-14638. [Dynamometer] Fix scripts to refer to current build structure. (#1673)

hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/bash/generate-block-lists.sh

@@ -26,7 +26,7 @@ else
   exit 1
 fi
 
-script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
+script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../.."
 
 for f in ${script_pwd}/lib/*.jar; do
   # Skip adding the blockgen JAR since it is added by the `hadoop jar` command
@@ -34,5 +34,5 @@ for f in ${script_pwd}/lib/*.jar; do
     export HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$f"
   fi
 done
-"$hadoop_cmd" jar "${script_pwd}"/lib/dynamometer-blockgen-*.jar \
+"$hadoop_cmd" jar "${script_pwd}"/lib/hadoop-dynamometer-blockgen-*.jar \
   org.apache.hadoop.tools.dynamometer.blockgenerator.GenerateBlockImagesDriver "$@"

hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/start-dynamometer-cluster.sh

@@ -30,7 +30,7 @@ else
   exit 1
 fi
 
-script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
+script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../.."
 
 for f in ${script_pwd}/lib/*.jar; do
   # Skip adding the infra JAR since it is added by the `hadoop jar` command
@@ -38,4 +38,4 @@ for f in ${script_pwd}/lib/*.jar; do
     export HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$f"
   fi
 done
-"$hadoop_cmd" jar "${script_pwd}"/lib/dynamometer-infra-*.jar org.apache.hadoop.tools.dynamometer.Client "$@"
+"$hadoop_cmd" jar "${script_pwd}"/lib/hadoop-dynamometer-infra-*.jar org.apache.hadoop.tools.dynamometer.Client "$@"

hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/start-workload.sh

@@ -30,7 +30,7 @@ else
   exit 1
 fi
 
-script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
+script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../.."
 
 for f in ${script_pwd}/lib/*.jar; do
   # Skip adding the workload JAR since it is added by the `hadoop jar` command
@@ -38,5 +38,5 @@ for f in ${script_pwd}/lib/*.jar; do
     export HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$f"
   fi
 done
-"$hadoop_cmd" jar "${script_pwd}"/lib/dynamometer-workload-*.jar \
+"$hadoop_cmd" jar "${script_pwd}"/lib/hadoop-dynamometer-workload-*.jar \
   org.apache.hadoop.tools.dynamometer.workloadgenerator.WorkloadDriver "$@"