[
https://issues.apache.org/jira/browse/IMPALA-10931?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17495047#comment-17495047
]
Wenzhe Zhou commented on IMPALA-10931:
--------------------------------------
Following 4 diffs were merged to Kudu upstream so we don't need to make these
code changes in next Kudu rebase.
diff --git a/be/src/kudu/security/test/mini_kdc.cc
b/be/src/kudu/security/test/mini_kdc.cc
index 831699c4d..3cab6f556 100644
--- a/be/src/kudu/security/test/mini_kdc.cc
+++ b/be/src/kudu/security/test/mini_kdc.cc
@@ -309,7 +311,9 @@ Status MiniKdc::Kinit(const string& username) {
RETURN_NOT_OK(GetBinaryPath("kinit", &kinit));
unique_ptr<WritableFile> tmp_cc_file;
string tmp_cc_path;
- const auto tmp_template = Substitute("kinit-temp-$0.XXXXXX", username);
+ string tmp_username = username;
+ StripString(&tmp_username, "/", '_');
+ const auto tmp_template = Substitute("kinit-temp-$0.XXXXXX", tmp_username);
WritableFileOptions opts;
opts.is_sensitive = false;
RETURN_NOT_OK_PREPEND(Env::Default()->NewTempWritableFile(
diff --git a/be/src/kudu/security/tls_handshake.cc
b/be/src/kudu/security/tls_handshake.cc
index c313308ed..82e22e073 100644
--- a/be/src/kudu/security/tls_handshake.cc
+++ b/be/src/kudu/security/tls_handshake.cc
@@ -313,7 +313,7 @@ Status TlsHandshake::Finish(unique_ptr<Socket>* socket) {
if (data_size != 0) {
int fd = SSL_get_fd(ssl);
Socket sock(fd);
- uint8_t* data = reinterpret_cast<uint8_t*>(rbio_pending_data_.data());
+ const uint8_t* data = reinterpret_cast<const
uint8_t*>(rbio_pending_data_.data());
int32_t written = 0;
RETURN_NOT_OK(sock.Write(data, data_size, &written));
if (written != data_size) {
diff --git a/be/src/kudu/util/logging.h b/be/src/kudu/util/logging.h
index f8b03b527..8e2241f28 100644
--- a/be/src/kudu/util/logging.h
+++ b/be/src/kudu/util/logging.h
@@ -162,7 +162,7 @@ class ScopedDisableRedaction {
&google::LogMessage::SendToLog).stream()
#define KLOG_EVERY_N_SECS(severity, n_secs) \
- static logging::LogThrottler LOG_THROTTLER; \
+ static ::kudu::logging::LogThrottler LOG_THROTTLER; \
KLOG_EVERY_N_SECS_THROTTLER(severity, n_secs, LOG_THROTTLER, "no-tag")
diff --git a/be/src/kudu/util/random_util.h b/be/src/kudu/util/random_util.h
index 4448023ea..20b9c3f55 100644
--- a/be/src/kudu/util/random_util.h
+++ b/be/src/kudu/util/random_util.h
@@ -27,7 +27,10 @@
#include <glog/logging.h>
#include "kudu/gutil/map-util.h"
-#include "kudu/util/int128_util.h"
+#include "kudu/util/int128.h"
#include "kudu/util/random.h"
Patches for Kudu:
http://gerrit.cloudera.org:8080/18245,
http://gerrit.cloudera.org:8080/18246,
http://gerrit.cloudera.org:8080/18247,
http://gerrit.cloudera.org:8080/18248
> Rebase source code under be/src/kudu
> ------------------------------------
>
> Key: IMPALA-10931
> URL: https://issues.apache.org/jira/browse/IMPALA-10931
> Project: IMPALA
> Issue Type: Improvement
> Components: Backend
> Reporter: Wenzhe Zhou
> Assignee: Wenzhe Zhou
> Priority: Major
> Fix For: Impala 4.1.0
>
>
> Impala pulls KRPC in by copying and pasting several directories from Kudu's
> source code (/rpc, /util, and /security). This code has not been updated in
> more than a year and half. There are various fixes and improvements that have
> been made on the Kudu side, like supporting TLS v1.3 in KRPC. It would be
> nice to pull in all these improvements.
> There are a few patches which we made on the copied source code in
> be/src/kudu. We need to make sure that all those patches are incorporated or
> maintained when rebase be/src/kudu.
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
