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 2025/01/21 20:30:10 UTC
(kudu) branch master updated (f41a8bd17 -> 0788d303b)
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 f41a8bd17 [tserver] KUDU-3638 follow-up
new c188216e0 [thirdparty] fix RocksDB to compile with GCC13
new 0788d303b KUDU-3571: fix flakiness in AutoIncrementingItest
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:
.../integration-tests/auto_incrementing-itest.cc | 13 ++++---
thirdparty/download-thirdparty.sh | 5 ++-
thirdparty/patches/rocksdb-gcc13.patch | 45 ++++++++++++++++++++++
3 files changed, 55 insertions(+), 8 deletions(-)
create mode 100644 thirdparty/patches/rocksdb-gcc13.patch
(kudu) 02/02: KUDU-3571: fix flakiness in AutoIncrementingItest
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 0788d303be8c2fd8c31b5dca8f6ee765f567ddf8
Author: zhangyifan27 <ch...@163.com>
AuthorDate: Mon Jan 20 18:13:14 2025 +0800
KUDU-3571: fix flakiness in AutoIncrementingItest
This patch is a follow-up to 2b9a201. We added some waits before
inserting and scanning data to make sure operations are committed.
Change-Id: I62ca8fbc6b11e6935ca234abde9a3ce92620fbb6
Reviewed-on: http://gerrit.cloudera.org:8080/22363
Tested-by: Alexey Serbin <al...@apache.org>
Reviewed-by: Alexey Serbin <al...@apache.org>
---
src/kudu/integration-tests/auto_incrementing-itest.cc | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/kudu/integration-tests/auto_incrementing-itest.cc b/src/kudu/integration-tests/auto_incrementing-itest.cc
index 6f78b025f..320bb8aad 100644
--- a/src/kudu/integration-tests/auto_incrementing-itest.cc
+++ b/src/kudu/integration-tests/auto_incrementing-itest.cc
@@ -381,9 +381,13 @@ TEST_F(AutoIncrementingItest, BootstrapWithNoWals) {
// Restart the cluster.
cluster_->Shutdown();
ASSERT_OK(cluster_->Restart());
+ // Ensure that the tablet is running and leader elected.
+ ASSERT_EVENTUALLY([&] { ASSERT_OK(ClusterVerifier(cluster_.get()).RunKsck()); });
// Insert new data and validate the auto incrementing column values.
ASSERT_OK(InsertData(kNumRows, kNumRows * 2));
+ // Wait for all the replicas to converge.
+ NO_FATALS(ClusterVerifier(cluster_.get()).CheckCluster());
for (int j = 0; j < kNumTabletServers; j++) {
vector<string> results;
ASSERT_OK(ScanTablet(j, tablet_uuid, &results));
@@ -391,7 +395,6 @@ TEST_F(AutoIncrementingItest, BootstrapWithNoWals) {
for (int i = 0; i < results.size(); i++) {
ASSERT_EQ(Substitute("(int32 c0=$0, int64 $1=$2, string c1=\"string_val\")", i + 100,
Schema::GetAutoIncrementingColumnName(), i + 100 + 1), results[i]);
-
}
}
}
@@ -523,16 +526,14 @@ TEST_F(AutoIncrementingItest, BootstrapWalsDiverge) {
ASSERT_OK(InsertData(kNumRows, kNumRows * 2));
// Start back the tablet server and ensure all the replicas contain the same data.
- // We scan the replica on leader_ts_index last to give it reasonable time to start
- // serving scans.
ASSERT_OK(cluster_->tablet_server(leader_ts_index)->Restart());
- int j = (leader_ts_index + 1) % kNumTabletServers;
+ // Wait for all the replicas to converge.
+ NO_FATALS(ClusterVerifier(cluster_.get()).CheckCluster());
vector<vector<string>> results;
for (int i = 0; i < kNumTabletServers; i++) {
vector<string> result;
- ASSERT_OK(ScanTablet(j, tablet_uuid, &result));
+ ASSERT_OK(ScanTablet(i, tablet_uuid, &result));
results.emplace_back(result);
- j = (j + 1) % kNumTabletServers;
}
ASSERT_EQ(kNumTabletServers, results.size());
for (int i = 0; i < kNumTabletServers - 1; i++) {
(kudu) 01/02: [thirdparty] fix RocksDB to compile with GCC13
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 c188216e0df750aa2b38ff15f0ded2b2b3920f19
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Wed Jan 15 16:46:11 2025 -0800
[thirdparty] fix RocksDB to compile with GCC13
Change-Id: Ic68e62aca998c6a39245b27b438cb2e07f5ad43d
Reviewed-on: http://gerrit.cloudera.org:8080/22357
Tested-by: Alexey Serbin <al...@apache.org>
Reviewed-by: Abhishek Chennaka <ac...@cloudera.com>
---
thirdparty/download-thirdparty.sh | 5 ++--
thirdparty/patches/rocksdb-gcc13.patch | 45 ++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index e14f0d7bc..4d2de4663 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -482,11 +482,12 @@ fetch_and_patch \
$RANGER_KMS_SOURCE \
$RANGER_KMS_PATCHLEVEL
-ROCKSDB_PATCHLEVEL=0
+ROCKSDB_PATCHLEVEL=1
fetch_and_patch \
$ROCKSDB_NAME.tar.gz \
$ROCKSDB_SOURCE \
- $ROCKSDB_PATCHLEVEL
+ $ROCKSDB_PATCHLEVEL \
+ "patch -p1 < $TP_DIR/patches/rocksdb-gcc13.patch"
echo "---------------"
echo "Thirdparty dependencies downloaded successfully"
diff --git a/thirdparty/patches/rocksdb-gcc13.patch b/thirdparty/patches/rocksdb-gcc13.patch
new file mode 100644
index 000000000..40f7c87a6
--- /dev/null
+++ b/thirdparty/patches/rocksdb-gcc13.patch
@@ -0,0 +1,45 @@
+commit 88edfbfb5e1cac228f7cc31fbec24bb637fe54b1
+Author: Heiko Becker <he...@exherbo.org>
+Date: Wed Jan 25 14:30:32 2023 -0800
+
+ Fix build with gcc 13 by including <cstdint> (#11118)
+
+ Summary:
+ Like other versions before, gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t.
+
+ [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+ Pull Request resolved: https://github.com/facebook/rocksdb/pull/11118
+
+ Reviewed By: cbi42
+
+ Differential Revision: D42711356
+
+ Pulled By: ajkr
+
+ fbshipit-source-id: 5ea257b85b7017f40fd8fdbce965336da95c55b2
+
+diff --git a/table/block_based/data_block_hash_index.h b/table/block_based/data_block_hash_index.h
+index f356395f3..321522175 100644
+--- a/table/block_based/data_block_hash_index.h
++++ b/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+diff --git a/util/string_util.h b/util/string_util.h
+index 55d106fff..11178fd1d 100644
+--- a/util/string_util.h
++++ b/util/string_util.h
+@@ -6,6 +6,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>