IMPALA-3866: consistent user-facing terminology for scratch dirs Error messages inconsistently referred to "temporary" versus "scratch". Make the error messages consistent to make it easier for users to debug. Also make sure the --scratch_dirs configuration option is always mentioned.
Change-Id: I011e633721e206a2b6ecf1c34d5328f34fbc01ab Reviewed-on: http://gerrit.cloudera.org:8080/3805 Reviewed-by: Matthew Jacobs <[email protected]> Reviewed-by: Dan Hecht <[email protected]> Reviewed-by: Marcell Szabo <[email protected]> Tested-by: Internal 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/dd33e8fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/dd33e8fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/dd33e8fb Branch: refs/heads/master Commit: dd33e8fbae5de13c0c91a49a87d576a83cff36e4 Parents: 904265c Author: Tim Armstrong <[email protected]> Authored: Thu Jul 28 08:54:45 2016 -0700 Committer: Internal Jenkins <[email protected]> Committed: Fri Jul 29 21:48:07 2016 +0000 ---------------------------------------------------------------------- be/src/runtime/buffered-block-mgr.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/dd33e8fb/be/src/runtime/buffered-block-mgr.cc ---------------------------------------------------------------------- diff --git a/be/src/runtime/buffered-block-mgr.cc b/be/src/runtime/buffered-block-mgr.cc index a9e95cd..b560cc6 100644 --- a/be/src/runtime/buffered-block-mgr.cc +++ b/be/src/runtime/buffered-block-mgr.cc @@ -820,12 +820,13 @@ Status BufferedBlockMgr::AllocateScratchSpace(int64_t block_size, if (status.ok()) return Status::OK(); // Log error and try other files if there was a problem. Problematic files will be // blacklisted so we will not repeatedly log the same error. - LOG(WARNING) << "Error while allocating temporary file range: " - << status.msg().msg() << ". Will try another temporary file."; + LOG(WARNING) << "Error while allocating range in scratch file '" + << (*tmp_file)->path() << "': " << status.msg().msg() + << ". Will try another scratch file."; errs.push_back(status); } - Status err_status("No usable temporary files: space could not be allocated on any " - "temporary device."); + Status err_status("No usable scratch files: space could not be allocated in any " + "of the configured scratch directories (--scratch_dirs)."); for (int i = 0; i < errs.size(); ++i) { err_status.MergeStatus(errs[i]); } @@ -1100,7 +1101,7 @@ Status BufferedBlockMgr::FindBuffer(unique_lock<mutex>& lock, if (disable_spill_) { if (block_write_threshold_ == 0) { return Status("Spilling has been disabled due to no usable scratch space. " - "Please specify a usable scratch space location via the scratch_dirs " + "Please specify a usable scratch space location via the --scratch_dirs " "impalad flag."); } else { return Status("Spilling has been disabled for plans that do not have stats and "
