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 2020/03/04 07:12:02 UTC
[kudu] branch master updated: [ksck] field renamings: flags_ -->
unusual_flags_
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
The following commit(s) were added to refs/heads/master by this push:
new c3122b6 [ksck] field renamings: flags_ --> unusual_flags_
c3122b6 is described below
commit c3122b689a684b6a7503b46836ee645b9bbed8e8
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Tue Mar 3 19:07:47 2020 -0800
[ksck] field renamings: flags_ --> unusual_flags_
Renamed:
flags_ --> unusual_flags_
flags_state_ --> unusual_flags_state_
In addition, this patch contains other assorted re-factoring in the
same area of reporting on unusual flags.
A follow-up patch is based on this small re-factoring.
This changelist doesn't contain any functional modifications.
Change-Id: I5f795ded086e70f145b2e86fdfaaf10135f66ce2
Reviewed-on: http://gerrit.cloudera.org:8080/15356
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
---
src/kudu/tools/ksck-test.cc | 22 ++++++++++++----------
src/kudu/tools/ksck.cc | 8 ++++----
src/kudu/tools/ksck.h | 31 +++++++++++++++----------------
src/kudu/tools/ksck_remote.cc | 14 +++++++-------
4 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/src/kudu/tools/ksck-test.cc b/src/kudu/tools/ksck-test.cc
index 9c8f7bc..c21dd4e 100644
--- a/src/kudu/tools/ksck-test.cc
+++ b/src/kudu/tools/ksck-test.cc
@@ -20,6 +20,7 @@
#include <algorithm>
#include <atomic>
#include <cstdint>
+#include <initializer_list>
#include <map>
#include <memory>
#include <numeric>
@@ -34,6 +35,7 @@
#include <boost/optional/optional.hpp>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
+#include <google/protobuf/stubs/common.h>
#include <gtest/gtest.h>
#include <rapidjson/document.h>
@@ -90,7 +92,7 @@ class MockKsckMaster : public KsckMaster {
uuid_ = uuid;
version_ = "mock-version";
if (is_get_flags_available_) {
- flags_ = GetFlagsResponsePB{};
+ unusual_flags_.emplace();
}
}
@@ -113,10 +115,10 @@ class MockKsckMaster : public KsckMaster {
Status FetchUnusualFlags() override {
if (is_get_flags_available_) {
- flags_state_ = KsckFetchState::FETCHED;
+ unusual_flags_state_ = KsckFetchState::FETCHED;
return Status::OK();
}
- flags_state_ = KsckFetchState::FETCH_FAILED;
+ unusual_flags_state_ = KsckFetchState::FETCH_FAILED;
return Status::RemoteError("GetFlags not available");
}
@@ -125,7 +127,7 @@ class MockKsckMaster : public KsckMaster {
Status fetch_cstate_status_;
using KsckMaster::uuid_;
using KsckMaster::cstate_;
- using KsckMaster::flags_;
+ using KsckMaster::unusual_flags_;
using KsckMaster::version_;
private:
const bool is_get_flags_available_;
@@ -141,7 +143,7 @@ class MockKsckTabletServer : public KsckTabletServer {
is_get_flags_available_(is_get_flags_available) {
version_ = "mock-version";
if (is_get_flags_available_) {
- flags_ = GetFlagsResponsePB{};
+ unusual_flags_.emplace();
}
}
@@ -163,10 +165,10 @@ class MockKsckTabletServer : public KsckTabletServer {
Status FetchUnusualFlags() override {
if (is_get_flags_available_) {
- flags_state_ = KsckFetchState::FETCHED;
+ unusual_flags_state_ = KsckFetchState::FETCHED;
return Status::OK();
}
- flags_state_ = KsckFetchState::FETCH_FAILED;
+ unusual_flags_state_ = KsckFetchState::FETCH_FAILED;
return Status::RemoteError("GetFlags not available");
}
@@ -199,7 +201,7 @@ class MockKsckTabletServer : public KsckTabletServer {
// The fake progress amount for this mock server, used to mock checksum
// progress for this server.
int64_t checksum_progress_ = 10;
- using KsckTabletServer::flags_;
+ using KsckTabletServer::unusual_flags_;
using KsckTabletServer::location_;
using KsckTabletServer::version_;
@@ -1096,7 +1098,7 @@ TEST_F(KsckTest, TestMasterFlagCheck) {
}
shared_ptr<MockKsckMaster> master =
std::static_pointer_cast<MockKsckMaster>(cluster_->masters_.at(i));
- master->flags_ = flags;
+ master->unusual_flags_ = std::move(flags);
}
ASSERT_OK(ksck_->CheckMasterHealth());
ASSERT_OK(ksck_->CheckMasterUnusualFlags());
@@ -1229,7 +1231,7 @@ TEST_F(KsckTest, TestTserverFlagCheck) {
}
shared_ptr<MockKsckTabletServer> ts =
std::static_pointer_cast<MockKsckTabletServer>(entry.second);
- ts->flags_ = flags;
+ ts->unusual_flags_ = std::move(flags);
i++;
}
ASSERT_OK(ksck_->FetchInfoFromTabletServers());
diff --git a/src/kudu/tools/ksck.cc b/src/kudu/tools/ksck.cc
index 19e883d..60e29da 100644
--- a/src/kudu/tools/ksck.cc
+++ b/src/kudu/tools/ksck.cc
@@ -292,11 +292,11 @@ Status Ksck::CheckMasterUnusualFlags() {
int bad_masters = 0;
Status last_error = Status::OK();
for (const auto& master : cluster_->masters()) {
- if (!master->flags()) {
+ if (!master->unusual_flags()) {
bad_masters++;
continue;
}
- AddFlagsToFlagMaps(*master->flags(),
+ AddFlagsToFlagMaps(*master->unusual_flags(),
master->address(),
&results_.master_flag_to_servers_map,
&results_.master_flag_tags_map);
@@ -494,11 +494,11 @@ Status Ksck::CheckTabletServerUnusualFlags() {
int bad_tservers = 0;
for (const auto& uuid_and_ts : cluster_->tablet_servers()) {
const auto& tserver = uuid_and_ts.second;
- if (!tserver->flags()) {
+ if (!tserver->unusual_flags()) {
bad_tservers++;
continue;
}
- AddFlagsToFlagMaps(*tserver->flags(),
+ AddFlagsToFlagMaps(*tserver->unusual_flags(),
tserver->address(),
&results_.tserver_flag_to_servers_map,
&results_.tserver_flag_tags_map);
diff --git a/src/kudu/tools/ksck.h b/src/kudu/tools/ksck.h
index b631d1a..d90baf7 100644
--- a/src/kudu/tools/ksck.h
+++ b/src/kudu/tools/ksck.h
@@ -221,9 +221,9 @@ class KsckMaster {
return cstate_;
}
- virtual const boost::optional<server::GetFlagsResponsePB>& flags() const {
- CHECK_NE(KsckFetchState::UNINITIALIZED, flags_state_);
- return flags_;
+ virtual const boost::optional<server::GetFlagsResponsePB>& unusual_flags() const {
+ CHECK_NE(KsckFetchState::UNINITIALIZED, unusual_flags_state_);
+ return unusual_flags_;
}
std::string ToString() const {
@@ -249,18 +249,17 @@ class KsckMaster {
// if it succeeded or failed.
KsckFetchState state_ = KsckFetchState::UNINITIALIZED;
- // flags_state_ reflects whether the fetch of the non-critical flags info has
- // been done, and if it succeeded or failed.
- KsckFetchState flags_state_ = KsckFetchState::UNINITIALIZED;
-
// May be none if fetching info from the master fails.
boost::optional<std::string> version_;
// May be none if consensus state fetch fails.
boost::optional<consensus::ConsensusStatePB> cstate_;
+ // unusual_flags_state_ reflects whether the fetch of the non-critical flags
+ // info has been done, and if it succeeded or failed.
+ KsckFetchState unusual_flags_state_ = KsckFetchState::UNINITIALIZED;
// May be none if flag fetch fails.
- boost::optional<server::GetFlagsResponsePB> flags_;
+ boost::optional<server::GetFlagsResponsePB> unusual_flags_;
private:
DISALLOW_COPY_AND_ASSIGN(KsckMaster);
@@ -350,9 +349,9 @@ class KsckTabletServer {
return version_;
}
- virtual const boost::optional<server::GetFlagsResponsePB>& flags() const {
- CHECK_NE(KsckFetchState::UNINITIALIZED, flags_state_);
- return flags_;
+ virtual const boost::optional<server::GetFlagsResponsePB>& unusual_flags() const {
+ CHECK_NE(KsckFetchState::UNINITIALIZED, unusual_flags_state_);
+ return unusual_flags_;
}
uint64_t current_timestamp() const {
@@ -373,18 +372,18 @@ class KsckTabletServer {
// it succeeded or failed.
KsckFetchState state_ = KsckFetchState::UNINITIALIZED;
- // flags_state_ reflects whether the fetch of the non-critical flags info has
- // been done, and if it succeeded or failed.
- KsckFetchState flags_state_ = KsckFetchState::UNINITIALIZED;
-
TabletStatusMap tablet_status_map_;
TabletConsensusStateMap tablet_consensus_state_map_;
// May be none if fetching info from the tablet server fails.
boost::optional<std::string> version_;
+ // unusual_flags_state_ reflects whether the fetch of the non-critical flags
+ // info has been done, and if it succeeded or failed.
+ KsckFetchState unusual_flags_state_ = KsckFetchState::UNINITIALIZED;
// May be none if flag fetch fails.
- boost::optional<server::GetFlagsResponsePB> flags_;
+ boost::optional<server::GetFlagsResponsePB> unusual_flags_;
+
std::atomic<uint64_t> timestamp_;
const std::string uuid_;
std::string location_;
diff --git a/src/kudu/tools/ksck_remote.cc b/src/kudu/tools/ksck_remote.cc
index d9a4c46..0571464 100644
--- a/src/kudu/tools/ksck_remote.cc
+++ b/src/kudu/tools/ksck_remote.cc
@@ -20,6 +20,7 @@
#include <atomic>
#include <cstdint>
#include <functional>
+#include <initializer_list>
#include <map>
#include <mutex>
#include <ostream>
@@ -28,7 +29,6 @@
#include <boost/bind.hpp> // IWYU pragma: keep
#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
-#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include "kudu/client/client-internal.h"
@@ -172,10 +172,10 @@ Status RemoteKsckMaster::FetchUnusualFlags() {
server::GetFlagsResponsePB resp;
Status s = FetchUnusualFlagsCommon(generic_proxy_, &resp);
if (!s.ok()) {
- flags_state_ = KsckFetchState::FETCH_FAILED;
+ unusual_flags_state_ = KsckFetchState::FETCH_FAILED;
} else {
- flags_state_ = KsckFetchState::FETCHED;
- flags_ = resp;
+ unusual_flags_state_ = KsckFetchState::FETCHED;
+ unusual_flags_ = std::move(resp);
}
return s;
}
@@ -297,10 +297,10 @@ Status RemoteKsckTabletServer::FetchUnusualFlags() {
server::GetFlagsResponsePB resp;
Status s = FetchUnusualFlagsCommon(generic_proxy_, &resp);
if (!s.ok()) {
- flags_state_ = KsckFetchState::FETCH_FAILED;
+ unusual_flags_state_ = KsckFetchState::FETCH_FAILED;
} else {
- flags_state_ = KsckFetchState::FETCHED;
- flags_ = resp;
+ unusual_flags_state_ = KsckFetchState::FETCHED;
+ unusual_flags_ = std::move(resp);
}
return s;
}