You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2018/10/24 19:38:47 UTC
kudu git commit: Follow-up for commit fff0da840
Repository: kudu
Updated Branches:
refs/heads/master fff0da840 -> 53183f1e5
Follow-up for commit fff0da840
Change-Id: Ida8c8ee2c0950b3d71aa7f4bbf0b86ef53f567f9
Reviewed-on: http://gerrit.cloudera.org:8080/11768
Reviewed-by: Will Berkeley <wd...@gmail.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/53183f1e
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/53183f1e
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/53183f1e
Branch: refs/heads/master
Commit: 53183f1e5b7d88a0d996f59a6259fe7ae48e7be9
Parents: fff0da8
Author: Adar Dembo <ad...@cloudera.com>
Authored: Wed Oct 24 11:29:27 2018 -0700
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Wed Oct 24 19:38:27 2018 +0000
----------------------------------------------------------------------
src/kudu/tablet/transactions/transaction_tracker-test.cc | 2 +-
src/kudu/tablet/transactions/transaction_tracker.cc | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/53183f1e/src/kudu/tablet/transactions/transaction_tracker-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/transactions/transaction_tracker-test.cc b/src/kudu/tablet/transactions/transaction_tracker-test.cc
index 44d21c0..13b30b2 100644
--- a/src/kudu/tablet/transactions/transaction_tracker-test.cc
+++ b/src/kudu/tablet/transactions/transaction_tracker-test.cc
@@ -253,7 +253,7 @@ TEST_F(TransactionTrackerTest, TestTooManyTransactions) {
LOG(INFO) << "Added " << drivers.size() << " drivers";
ASSERT_TRUE(s.IsServiceUnavailable());
- ASSERT_STR_CONTAINS(s.ToString(), "exceeded its transaction memory limit");
+ ASSERT_STR_CONTAINS(s.ToString(), "exceeds the transaction memory limit");
NO_FATALS(CheckMetrics(entity_, drivers.size(), 0, 1));
NO_FATALS(CheckMemTracker(t));
http://git-wip-us.apache.org/repos/asf/kudu/blob/53183f1e/src/kudu/tablet/transactions/transaction_tracker.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/transactions/transaction_tracker.cc b/src/kudu/tablet/transactions/transaction_tracker.cc
index 34a348c..b23ef9e 100644
--- a/src/kudu/tablet/transactions/transaction_tracker.cc
+++ b/src/kudu/tablet/transactions/transaction_tracker.cc
@@ -111,11 +111,12 @@ Status TransactionTracker::Add(TransactionDriver* driver) {
TabletReplica* replica = driver->state()->tablet_replica();
string msg = Substitute(
- "Transaction failed, tablet $0 exceeded its transaction memory limit "
- "($1) or the limit of an ancestral memory tracker. This transaction "
- "consumption's was $2 and the current consumption is $3.",
+ "transaction on tablet $0 rejected due to memory pressure: the memory "
+ "usage of this transaction ($1) plus the current consumption ($2) "
+ "exceeds the transaction memory limit ($3) or the limit of an ancestral "
+ "memory tracker.",
replica ? replica->tablet()->tablet_id() : "(unknown)",
- mem_tracker_->limit(), driver_mem_footprint, mem_tracker_->consumption());
+ driver_mem_footprint, mem_tracker_->consumption(), mem_tracker_->limit());
KLOG_EVERY_N_SECS(WARNING, 1) << msg << THROTTLE_MSG;