Revert "Remove Yarn from minicluster by default." This reverts commit c05df104570fa2cb7067599bbe3b87740ca9f09e.
Change-Id: I00151795581d22a9852cceaca1d21325d68dbe59 Reviewed-on: http://gerrit.cloudera.org:8080/9969 Reviewed-by: Philip Zeyliger <phi...@cloudera.com> Tested-by: Philip Zeyliger <phi...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/impala/repo Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/f09f68a3 Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/f09f68a3 Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/f09f68a3 Branch: refs/heads/2.x Commit: f09f68a3aee437226bf33db1fd969069f54ef446 Parents: 6bee662 Author: Philip Zeyliger <phi...@cloudera.com> Authored: Tue Apr 10 16:19:52 2018 +0000 Committer: Impala Public Jenkins <impala-public-jenk...@gerrit.cloudera.org> Committed: Wed Apr 11 22:56:01 2018 +0000 ---------------------------------------------------------------------- testdata/cluster/admin | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/impala/blob/f09f68a3/testdata/cluster/admin ---------------------------------------------------------------------- diff --git a/testdata/cluster/admin b/testdata/cluster/admin index 74b5a9c..cb33e21 100755 --- a/testdata/cluster/admin +++ b/testdata/cluster/admin @@ -18,7 +18,7 @@ # specific language governing permissions and limitations # under the License. -# This will create/control/destroy a local hdfs/yarn/kms/kudu cluster. +# This will create/control/destroy a local hdfs+yarn cluster. # # All roles run on 127.0.0.1, just like the standard mini cluster included with hadoop. # The difference is with this cluster, each role runs in its own process and has its own @@ -31,14 +31,12 @@ set -euo pipefail trap 'echo Error in $0 at line $LINENO: $(awk "NR == $LINENO" $0)' ERR : ${IMPALA_KERBERIZE=} -: ${INCLUDE_YARN=} -while getopts vky OPT; do +while getopts vk OPT; do case $OPT in v) set -x;; k) export IMPALA_KERBERIZE=1;; - y) export INCLUDE_YARN=1;; - ?) echo "Usage: $0 [-v (verbose) -k (kerberize) -y (yarn)] ACTION (see source...)"; exit 1;; + ?) echo "Usage: $0 [-v (verbose) -k (kerberize)] ACTION (see source...)"; exit 1;; esac done shift $(($OPTIND-1)) @@ -56,10 +54,7 @@ export KILL_CLUSTER_MARKER=IBelongToTheMiniCluster if [[ "$TARGET_FILESYSTEM" == "hdfs" ]]; then # The check above indicates that the regular mini-cluster is in use. - SUPPORTED_SERVICES=(hdfs kms) - if [ -n "${INCLUDE_YARN}" ]; then - SUPPORTED_SERVICES+=(yarn) - fi + SUPPORTED_SERVICES=(hdfs yarn kms) else # Either a remote distributed file system or a local non-distributed file system is # in use. Currently the only service that is expected to work is Kudu, though in theory