Repository: incubator-impala Updated Branches: refs/heads/master e0f69ca1d -> 428b5a1bf
IMPALA-5482: fix git checkout when workloads are modified When git checkout would overwrite changes, it fails and alerts the user to do something with the changes. This patch removes any changes to files induced by the workload copy-and-paste. Testing: using a patch provided by Lars Volker that touched testdata/workloads/ (https://gerrit.cloudera.org/#/c/7073/), I was able to reproduce the problem he saw and see that this patch fixed it. Change-Id: I9a0d004c353eb4b547aeaf3c56289594326653d7 Reviewed-on: http://gerrit.cloudera.org:8080/7145 Reviewed-by: Lars Volker <[email protected]> Tested-by: Impala Public Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/de9f5230 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/de9f5230 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/de9f5230 Branch: refs/heads/master Commit: de9f5230eb5580230a62b19fbc9d93a180ef8c24 Parents: e0f69ca Author: Jim Apple <[email protected]> Authored: Fri Jun 9 20:17:58 2017 -0700 Committer: Impala Public Jenkins <[email protected]> Committed: Sun Jun 11 18:20:22 2017 +0000 ---------------------------------------------------------------------- bin/single_node_perf_run.py | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/de9f5230/bin/single_node_perf_run.py ---------------------------------------------------------------------- diff --git a/bin/single_node_perf_run.py b/bin/single_node_perf_run.py index 74ab944..b9fe095 100755 --- a/bin/single_node_perf_run.py +++ b/bin/single_node_perf_run.py @@ -228,6 +228,8 @@ def perf_ab_test(options, args): if len(args) > 1 and args[1]: hash_b = get_git_hash_for_name(args[1]) + # discard any changes created by the previous restore_workloads() + sh.git.checkout("--", "testdata/workloads") build(hash_b, options) restore_workloads(workload_dir) start_impala(options.num_impalads) @@ -298,6 +300,8 @@ def main(): try: perf_ab_test(options, args) finally: + # discard any changes created by the previous restore_workloads() + sh.git.checkout("--", "testdata/workloads") sh.git.checkout(current_hash)
