[kudu] branch master updated (4482781 -> 12d9a84)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git.


    from 4482781  tablet: avoid locking for Tablet::state checks
     new 46d2cdf  [scanner] output the essential error message first
     new 12d9a84  [maintenance_manager-test] small clean-up log retention scenario

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/kudu/tserver/tablet_service.cc        |  4 ++--
 src/kudu/util/maintenance_manager-test.cc | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

[kudu] 01/02: [scanner] output the essential error message first

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git

commit 46d2cdf2b52a9511783d28b4fbecda847047070b
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Thu May 28 21:58:00 2020 -0700

    [scanner] output the essential error message first
    
    While digging through logs as they seen in kudu-tserver Web UI,
    I found it hard to get to the essence of the warning message on
    setting up a new scanner: it contained a very long string prefix
    with the information about the scan projection.
    
    This patch addresses that, moving the essential information on the
    status into the beginning of the message.
    
    Otherwise, this patch doesn't contain any functional modifications.
    
    Change-Id: I06e4ed516dcd2b520f26ddc580aed00be239df04
    Reviewed-on: http://gerrit.cloudera.org:8080/15999
    Tested-by: Kudu Jenkins
    Reviewed-by: Bankim Bhavsar <ba...@cloudera.com>
---
 src/kudu/tserver/tablet_service.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kudu/tserver/tablet_service.cc b/src/kudu/tserver/tablet_service.cc
index 91e3477..4a5c040 100644
--- a/src/kudu/tserver/tablet_service.cc
+++ b/src/kudu/tserver/tablet_service.cc
@@ -2647,8 +2647,8 @@ Status TabletServiceImpl::HandleNewScanRequest(TabletReplica* replica,
   TRACE("Iterator init: $0", s.ToString());
 
   if (PREDICT_FALSE(!s.ok())) {
-    LOG(WARNING) << Substitute("Error setting up scanner with request $0: $1",
-                               SecureShortDebugString(*req), s.ToString());
+    LOG(WARNING) << Substitute("Error setting up scanner with request: $0: $1",
+                               s.ToString(), SecureShortDebugString(*req));
     // If the replica has been stopped, e.g. due to disk failure, return
     // TABLET_FAILED so the scan can be handled appropriately (fail over to
     // another tablet server if fault-tolerant).

[kudu] 02/02: [maintenance_manager-test] small clean-up log retention scenario

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git

commit 12d9a84b49675a20ad10f1f330cb3ed083ea4e92
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Tue Jun 2 12:18:56 2020 -0700

    [maintenance_manager-test] small clean-up log retention scenario
    
    Updated the expected string to be resistant to memory usage
    fluctuations.  The motivation for this change is seeing sporadic
    failures due to the discrepancy in reported memory usage: e.g.,
    2.00% instead of 0.00% was reported by dist-test here:
      http://dist-test.cloudera.org/job?job_id=aserbin.1591087472.56061
    
    Change-Id: I4c0a80412f6e6b0d8d594e3310e6d6e26c12267a
    Reviewed-on: http://gerrit.cloudera.org:8080/16025
    Tested-by: Kudu Jenkins
    Reviewed-by: Andrew Wong <aw...@cloudera.com>
---
 src/kudu/util/maintenance_manager-test.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/kudu/util/maintenance_manager-test.cc b/src/kudu/util/maintenance_manager-test.cc
index c2d6301..3a0954d 100644
--- a/src/kudu/util/maintenance_manager-test.cc
+++ b/src/kudu/util/maintenance_manager-test.cc
@@ -390,20 +390,20 @@ TEST_F(MaintenanceManagerTest, TestPrioritizeLogRetentionUnderMemoryPressure) {
 
   auto op_and_why = manager_->FindBestOp();
   ASSERT_EQ(&op1, op_and_why.first);
-  EXPECT_EQ(op_and_why.second, "under memory pressure (0.00% used), 100 bytes log retention, and "
-                               "flush 100 bytes memory");
+  EXPECT_STR_CONTAINS(
+      op_and_why.second, "100 bytes log retention, and flush 100 bytes memory");
   manager_->UnregisterOp(&op1);
 
   op_and_why = manager_->FindBestOp();
   ASSERT_EQ(&op2, op_and_why.first);
-  EXPECT_EQ(op_and_why.second, "under memory pressure (0.00% used), 100 bytes log retention, and "
-                               "flush 99 bytes memory");
+  EXPECT_STR_CONTAINS(
+      op_and_why.second, "100 bytes log retention, and flush 99 bytes memory");
   manager_->UnregisterOp(&op2);
 
   op_and_why = manager_->FindBestOp();
   ASSERT_EQ(&op3, op_and_why.first);
-  EXPECT_EQ(op_and_why.second, "under memory pressure (0.00% used), 99 bytes log retention, and "
-                               "flush 101 bytes memory");
+  EXPECT_STR_CONTAINS(
+      op_and_why.second, "99 bytes log retention, and flush 101 bytes memory");
   manager_->UnregisterOp(&op3);
 }