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 2019/05/01 05:20:49 UTC

[kudu] branch master updated (072c00c -> 1610f69)

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

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


    from 072c00c  tserver: remove some duplicated code
     new 762ae0f  Deflake KsckRemoteTest.TestClusterWithLocation
     new d4f16fc  Deflake ClientTest.TestServerTooBusyRetry
     new 1610f69  [www] highlight primary key in tserver Web UI

The 3 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/client/client-test.cc     | 4 ++++
 src/kudu/tools/ksck.cc             | 3 +++
 src/kudu/tools/ksck_remote-test.cc | 2 --
 www/tablet.mustache                | 6 +++---
 4 files changed, 10 insertions(+), 5 deletions(-)


[kudu] 01/03: Deflake KsckRemoteTest.TestClusterWithLocation

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 762ae0f87025441edeba65004cfbead8aa67346b
Author: Will Berkeley <wd...@gmail.com>
AuthorDate: Tue Apr 30 09:50:24 2019 -0700

    Deflake KsckRemoteTest.TestClusterWithLocation
    
    Ksck::CheckMasterConsensus did not reset a boolean flag indicating
    whether a master consensus conflict had been found. This meant that, if
    an instance of the Ksck object was being used to check repeatedly for
    master consensus conflict, it would fail to recognize if the conflict
    went away. Indeed, this was happening in
    RemoteKsckTest.TestClusterWithLocation and made the test about 1% flaky
    on debug (8/1000 failed). I ran 1000 runs on debug with this fix and saw
    no failures.
    
    Also, the CheckMasterHealth and CheckMasterUnusualFlags calls
    outside ASSERT_EVENTUALLY are unnecessary. I removed them.
    
    Change-Id: I3cfffad1c997a820834fadb55491691ea29ffaa2
    Reviewed-on: http://gerrit.cloudera.org:8080/13198
    Reviewed-by: Adar Dembo <ad...@cloudera.com>
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Tested-by: Will Berkeley <wd...@gmail.com>
---
 src/kudu/tools/ksck.cc             | 3 +++
 src/kudu/tools/ksck_remote-test.cc | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/kudu/tools/ksck.cc b/src/kudu/tools/ksck.cc
index ab28cdd..0a77cc0 100644
--- a/src/kudu/tools/ksck.cc
+++ b/src/kudu/tools/ksck.cc
@@ -230,6 +230,9 @@ Status Ksck::CheckMasterHealth() {
 }
 
 Status Ksck::CheckMasterConsensus() {
+  // Reset this instance's view of master consensus conflict, in case this
+  // instance is being used to repeatedly check for master consensus conflict.
+  results_.master_consensus_conflict = false;
   if (!FLAGS_consensus) {
     return Status::OK();
   }
diff --git a/src/kudu/tools/ksck_remote-test.cc b/src/kudu/tools/ksck_remote-test.cc
index edbe060..fc76b4c 100644
--- a/src/kudu/tools/ksck_remote-test.cc
+++ b/src/kudu/tools/ksck_remote-test.cc
@@ -527,8 +527,6 @@ TEST_F(RemoteKsckTest, TestClusterWithLocation) {
   ASSERT_OK(mini_cluster_->AddTabletServer());
   ASSERT_EQ(4, mini_cluster_->num_tablet_servers());
 
-  ASSERT_OK(ksck_->CheckMasterHealth());
-  ASSERT_OK(ksck_->CheckMasterUnusualFlags());
   // In case of TSAN builds and running the test at inferior machines
   // with lot of concurrent activity, the masters and tablet servers run Raft
   // re-elections from time to time. Also, establishing and negotiation


[kudu] 03/03: [www] highlight primary key in tserver Web UI

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1610f6907f2973ddb5e3df7465faebd9af9f3855
Author: helifu <hz...@corp.netease.com>
AuthorDate: Wed May 1 00:17:54 2019 +0800

    [www] highlight primary key in tserver Web UI
    
    This patch is a follow on to https://gerrit.cloudera.org/#/c/12316/
    
    Change-Id: I57dbcea938f9c6b436c7c4f98e7e9a89f2995784
    Reviewed-on: http://gerrit.cloudera.org:8080/13187
    Reviewed-by: Greg Solovyev <gs...@cloudera.com>
    Reviewed-by: Grant Henke <gr...@apache.org>
    Tested-by: Adar Dembo <ad...@cloudera.com>
---
 www/tablet.mustache | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/tablet.mustache b/www/tablet.mustache
index cbc0ff5..739dc0b 100644
--- a/www/tablet.mustache
+++ b/www/tablet.mustache
@@ -43,9 +43,9 @@ under the License.
     <tbody>
     {{#columns}}
       <tr>
-        <th>{{#is_key}}<u>{{/is_key}}
-          {{name}}
-          {{#is_key}}</u>{{/is_key}}</th>
+        <th>
+          {{#is_key}}<img src="key.png" width=12 height=6 />&nbsp;&nbsp;{{/is_key}}{{name}}
+        </th>
         <td>{{id}}</a></td>
         <td>{{type}}</td>
         <td>{{encoding}}</td>


[kudu] 02/03: Deflake ClientTest.TestServerTooBusyRetry

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d4f16fc6bc3df2afa49813d9ce73f6b7233648aa
Author: Will Berkeley <wd...@gmail.com>
AuthorDate: Tue Apr 30 15:15:03 2019 -0700

    Deflake ClientTest.TestServerTooBusyRetry
    
    ClientTest.TestServerTooBusyRetry is a mess of a test. In TSAN mode,
    there are less rows inserted, so scans require less round trips to
    complete, but at the same time threads start slower, so the number of
    scans in-flight at once will tend to be lower. This causes the test to
    occasionally fail to cause a service queue overflow, as it is intended
    to do. Eventually, the test fails because TSAN has an upper bound on the
    number of threads that can be created in the lifetime of a single TSAN
    process, and the test slowly creates scan threads.
    
    This patch attempts to address the problem by raising the scan batch
    latency in TSAN mode. With this patch, I saw 0 failures in 1000 runs.
    Without it, I got tired of waiting for 850/1000 to finish after 15
    minutes.
    
    This is a quick fix. In the future someone should consider a more
    serious rewrite of this test.
    
    Change-Id: Id4d2ee077e9d107fb475c399af5690084bdeef49
    Reviewed-on: http://gerrit.cloudera.org:8080/13200
    Reviewed-by: Adar Dembo <ad...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 src/kudu/client/client-test.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/kudu/client/client-test.cc b/src/kudu/client/client-test.cc
index 117a8c3..8547b89 100644
--- a/src/kudu/client/client-test.cc
+++ b/src/kudu/client/client-test.cc
@@ -5251,7 +5251,11 @@ TEST_F(ClientTest, TestServerTooBusyRetry) {
 
   // Introduce latency in each scan to increase the likelihood of
   // ERROR_SERVER_TOO_BUSY.
+#ifdef THREAD_SANITIZER
+  FLAGS_scanner_inject_latency_on_each_batch_ms = 100;
+#else
   FLAGS_scanner_inject_latency_on_each_batch_ms = 10;
+#endif
 
   // Reduce the service queue length of each tablet server in order to increase
   // the likelihood of ERROR_SERVER_TOO_BUSY.