You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2019/12/05 07:04:38 UTC

[kudu] branch master updated (caf2b50 -> 4ab2e75)

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 caf2b50  KUDU-2986 p2: adjust the 'live_row_count' metric in master's Web UI
     new ddaf67d  clang_tidy_gerrit: disable llvm-include-order check
     new 24f5f64  [style] re-order x.h and x-inl.h to please IWYU
     new 4ab2e75  [test] KUDU-2610 fix flakiness in kudu-admin-test scenario

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:
 build-support/clang_tidy_gerrit.py | 19 +++++++++++++++++++
 src/kudu/cfile/block_pointer.h     |  2 +-
 src/kudu/cfile/cfile_writer.cc     |  2 +-
 src/kudu/cfile/index_block.cc      |  2 +-
 src/kudu/cfile/plain_block.h       |  2 +-
 src/kudu/tablet/rowset_tree.cc     |  2 +-
 src/kudu/tools/kudu-admin-test.cc  |  4 ++--
 7 files changed, 26 insertions(+), 7 deletions(-)


[kudu] 02/03: [style] re-order x.h and x-inl.h to please IWYU

Posted by 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 24f5f646777cf487f14af587e04a24046158b012
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Wed Dec 4 20:28:39 2019 -0800

    [style] re-order x.h and x-inl.h to please IWYU
    
    IWYU explicitly prefer x.h to precede x-inl.h in the ordering
    of include files.  This patch updated few files to adhere to
    IWYU's preference, unifying the order of such include file pairs
    across the codebase.
    
    This patch doesn't contain any functional modifications.
    
    Change-Id: I697416766610d169f1e13450310fd218c197b439
    Reviewed-on: http://gerrit.cloudera.org:8080/14844
    Reviewed-by: Adar Dembo <ad...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 src/kudu/cfile/block_pointer.h | 2 +-
 src/kudu/cfile/cfile_writer.cc | 2 +-
 src/kudu/cfile/index_block.cc  | 2 +-
 src/kudu/cfile/plain_block.h   | 2 +-
 src/kudu/tablet/rowset_tree.cc | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/kudu/cfile/block_pointer.h b/src/kudu/cfile/block_pointer.h
index 0c4554c..885a41a 100644
--- a/src/kudu/cfile/block_pointer.h
+++ b/src/kudu/cfile/block_pointer.h
@@ -22,8 +22,8 @@
 
 #include "kudu/cfile/cfile.pb.h"
 #include "kudu/gutil/strings/substitute.h"
-#include "kudu/util/coding-inl.h"
 #include "kudu/util/coding.h"
+#include "kudu/util/coding-inl.h"
 #include "kudu/util/status.h"
 
 namespace kudu {
diff --git a/src/kudu/cfile/cfile_writer.cc b/src/kudu/cfile/cfile_writer.cc
index fce4b76..5769e10 100644
--- a/src/kudu/cfile/cfile_writer.cc
+++ b/src/kudu/cfile/cfile_writer.cc
@@ -39,8 +39,8 @@
 #include "kudu/common/types.h"
 #include "kudu/gutil/port.h"
 #include "kudu/util/array_view.h" // IWYU pragma: keep
-#include "kudu/util/coding-inl.h"
 #include "kudu/util/coding.h"
+#include "kudu/util/coding-inl.h"
 #include "kudu/util/compression/compression_codec.h"
 #include "kudu/util/crc.h"
 #include "kudu/util/debug/trace_event.h"
diff --git a/src/kudu/cfile/index_block.cc b/src/kudu/cfile/index_block.cc
index 79cb608..ecfef4b 100644
--- a/src/kudu/cfile/index_block.cc
+++ b/src/kudu/cfile/index_block.cc
@@ -25,8 +25,8 @@
 
 #include "kudu/gutil/port.h"
 #include "kudu/gutil/strings/substitute.h"
-#include "kudu/util/coding-inl.h"
 #include "kudu/util/coding.h"
+#include "kudu/util/coding-inl.h"
 #include "kudu/util/pb_util.h"
 #include "kudu/util/protobuf_util.h"
 
diff --git a/src/kudu/cfile/plain_block.h b/src/kudu/cfile/plain_block.h
index b262478..5c11534 100644
--- a/src/kudu/cfile/plain_block.h
+++ b/src/kudu/cfile/plain_block.h
@@ -24,8 +24,8 @@
 #include "kudu/cfile/cfile_util.h"
 #include "kudu/common/columnblock.h"
 #include "kudu/gutil/port.h"
-#include "kudu/util/coding-inl.h"
 #include "kudu/util/coding.h"
+#include "kudu/util/coding-inl.h"
 #include "kudu/util/hexdump.h"
 
 namespace kudu {
diff --git a/src/kudu/tablet/rowset_tree.cc b/src/kudu/tablet/rowset_tree.cc
index eceb631..dc3a25b 100644
--- a/src/kudu/tablet/rowset_tree.cc
+++ b/src/kudu/tablet/rowset_tree.cc
@@ -30,8 +30,8 @@
 #include "kudu/gutil/stl_util.h"
 #include "kudu/tablet/rowset.h"
 #include "kudu/tablet/rowset_metadata.h"
-#include "kudu/util/interval_tree-inl.h"
 #include "kudu/util/interval_tree.h"
+#include "kudu/util/interval_tree-inl.h"
 #include "kudu/util/slice.h"
 
 using std::vector;


[kudu] 03/03: [test] KUDU-2610 fix flakiness in kudu-admin-test scenario

Posted by 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 4ab2e7564619b80555a8ddc60a9162cffe75084e
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Tue Dec 3 21:58:51 2019 -0800

    [test] KUDU-2610 fix flakiness in kudu-admin-test scenario
    
    I saw AdminCliTest.TestSimultaneousLeaderTransferAndAbruptStepdown
    failing with timed-out error trying to write data to the test table:
    
      http://dist-test.cloudera.org/job?job_id=aserbin.1575418627.126650
    
    A log from another occurrence of this issue is attached to
    https://issues.apache.org/jira/browse/KUDU-2610
    
    It seems the frequency of the leader change/step-down requests might be
    safely decreased to make this test more stable.  The test already have
    the frequency of the leader change requests clamped down for ASAN
    builds compared with the RELEASE/DEBUG/TSAN case.
    
    Change-Id: I98e792783efa2909d10174f84ddd785f5a968046
    Reviewed-on: http://gerrit.cloudera.org:8080/14827
    Reviewed-by: Adar Dembo <ad...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 src/kudu/tools/kudu-admin-test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kudu/tools/kudu-admin-test.cc b/src/kudu/tools/kudu-admin-test.cc
index 6670975..6d8f3c6 100644
--- a/src/kudu/tools/kudu-admin-test.cc
+++ b/src/kudu/tools/kudu-admin-test.cc
@@ -1507,9 +1507,9 @@ TEST_F(AdminCliTest, TestSimultaneousLeaderTransferAndAbruptStepdown) {
   // complete, so we'll back off on how frequently we disrupt leadership to give
   // time for progress to be made.
   #if defined(ADDRESS_SANITIZER)
-    const auto leader_change_period_sec = MonoDelta::FromMilliseconds(5000);
+    const auto leader_change_period_sec = MonoDelta::FromMilliseconds(6000);
   #else
-    const auto leader_change_period_sec = MonoDelta::FromMilliseconds(1000);
+    const auto leader_change_period_sec = MonoDelta::FromMilliseconds(2000);
   #endif
 
   const string& master_addr = cluster_->master()->bound_rpc_addr().ToString();


[kudu] 01/03: clang_tidy_gerrit: disable llvm-include-order check

Posted by 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 ddaf67d8b7a5f560fcd5645e14739da4ba478869
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Wed Dec 4 15:39:39 2019 -0800

    clang_tidy_gerrit: disable llvm-include-order check
    
    The 'llvm-include-order' check in clang-tidy contradicts with IWYU
    on the order of 'file.h' and 'file-inl.h' include file pairs.
    IWYU intentionally orders 'file-inl.h' and 'file.h' to make 'file.h'
    preceding it's 'file-inl.h' counterpart.  To avoid confusion, let's
    isable the 'llvm-include-order' check.
    
    Change-Id: Ie1f0e3a5b8447940be74071cc6701ac5eb5ddcf6
    Reviewed-on: http://gerrit.cloudera.org:8080/14839
    Tested-by: Alexey Serbin <as...@cloudera.com>
    Reviewed-by: Adar Dembo <ad...@cloudera.com>
---
 build-support/clang_tidy_gerrit.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/build-support/clang_tidy_gerrit.py b/build-support/clang_tidy_gerrit.py
index 35b206a..cd500b1 100755
--- a/build-support/clang_tidy_gerrit.py
+++ b/build-support/clang_tidy_gerrit.py
@@ -49,6 +49,25 @@ DISABLED_TIDY_CHECKS=[
     # Although useful in production code, we use magic numbers liberally in
     # tests, and many would be net less clear as named constants.
     'readability-magic-numbers',
+
+    # IWYU has specific rules for ordering '-inl.h' include files, i.e.
+    # 'header.h' and its 'header-inl.h' counterpart. It seems in some cases
+    # including 'header-inl.h' before 'header.h' might even lead to compilation
+    # failures. So, IWYU intentionally re-orders them even if 'header-inl.h'
+    # comes before 'header.h' lexicographically in default C locale:
+    #   https://github.com/apache/kudu/blob/ \
+    #     89ce529e945731c48445db4a6f8af11f9f905aab/build-support/iwyu/ \
+    #     fix_includes.py#L1786-L1787
+    #
+    # That ordering contradicts with what clang-tidy recommends when using the
+    # 'llvm-include-order' check. To avoid confusion, let's disable the
+    # 'llvm-include-order'.
+    #
+    # TODO(aserbin): clarify whether it's possible to customize clang-tidy
+    #                behavior w.r.t. the sorting of such header files using
+    #                the format style options described at
+    #                https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+    'llvm-include-order',
 ]
 
 def run_tidy(sha="HEAD", is_rev_range=False):