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 2017/09/14 03:27:13 UTC
[1/2] kudu git commit: Add tablet state summary metrics
Repository: kudu
Updated Branches:
refs/heads/master 3f4972408 -> eed74ee6c
Add tablet state summary metrics
This patch adds metrics for the number of tablets in each state
(i.e. the number of tablets for each value of TabletStatePB). To
avoid contention in the tablet manager, the frequency with which
the state numbers are computed is limited. Requests that come
too soon for an update will receive cached counts. The maximum
frequency of updates is controlled by a new flag.
Change-Id: I9fda2061d341586f0aa343787af59984a627080a
Reviewed-on: http://gerrit.cloudera.org:8080/7980
Tested-by: Kudu Jenkins
Reviewed-by: Mike Percy <mp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/6fef9ca5
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/6fef9ca5
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/6fef9ca5
Branch: refs/heads/master
Commit: 6fef9ca5c9d1dcf571795c514cb9fecc493d0714
Parents: 3f49724
Author: Will Berkeley <wd...@apache.org>
Authored: Tue Aug 1 15:24:13 2017 -0700
Committer: Will Berkeley <wd...@gmail.com>
Committed: Thu Sep 14 02:38:16 2017 +0000
----------------------------------------------------------------------
src/kudu/integration-tests/tablet_copy-itest.cc | 89 +++++++++++
src/kudu/tserver/CMakeLists.txt | 1 +
src/kudu/tserver/ts_tablet_manager.cc | 52 +++++-
src/kudu/tserver/ts_tablet_manager.h | 21 ++-
src/kudu/tserver/ts_tablet_manager_metrics.cc | 158 +++++++++++++++++++
src/kudu/tserver/ts_tablet_manager_metrics.h | 63 ++++++++
src/kudu/util/metrics.cc | 2 +
src/kudu/util/metrics.h | 1 +
8 files changed, 380 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/integration-tests/tablet_copy-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/tablet_copy-itest.cc b/src/kudu/integration-tests/tablet_copy-itest.cc
index b151962..5612a2e 100644
--- a/src/kudu/integration-tests/tablet_copy-itest.cc
+++ b/src/kudu/integration-tests/tablet_copy-itest.cc
@@ -79,6 +79,9 @@
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
+METRIC_DECLARE_gauge_int32(tablets_num_running);
+METRIC_DECLARE_gauge_int32(tablets_num_bootstrapping);
+
DEFINE_int32(test_num_threads, 16,
"Number of test threads to launch");
DEFINE_int32(test_delete_leader_num_iters, 3,
@@ -1595,4 +1598,90 @@ TEST_F(TabletCopyITest, TestTabletCopyMetrics) {
NO_FATALS(cluster_->AssertNoCrashes());
}
+namespace {
+int64_t CountRunningTablets(ExternalTabletServer *ets) {
+ int64_t ret;
+ CHECK_OK(ets->GetInt64Metric(
+ &METRIC_ENTITY_server,
+ nullptr,
+ &METRIC_tablets_num_running,
+ "value",
+ &ret));
+ return ret;
+}
+
+int64_t CountBootstrappingTablets(ExternalTabletServer *ets) {
+ int64_t ret;
+ CHECK_OK(ets->GetInt64Metric(
+ &METRIC_ENTITY_server,
+ nullptr,
+ &METRIC_tablets_num_bootstrapping,
+ "value",
+ &ret));
+ return ret;
+}
+} // anonymous namespace
+
+// Check that state metrics work during tablet copy.
+TEST_F(TabletCopyITest, TestTabletStateMetricsDuringTabletCopy) {
+ MonoDelta kTimeout = MonoDelta::FromSeconds(30);
+ const int kTsIndex = 1; // Pick a random TS.
+ NO_FATALS(StartCluster({ "--tablet_state_walk_min_period_ms=10" }));
+
+ // Populate the tablet with some data.
+ TestWorkload workload(cluster_.get());
+ workload.Setup();
+ workload.Start();
+ while (workload.rows_inserted() < 1000) {
+ SleepFor(MonoDelta::FromMilliseconds(10));
+ }
+ workload.StopAndJoin();
+
+ TServerDetails* ts = ts_map_[cluster_->tablet_server(kTsIndex)->uuid()];
+ vector<ListTabletsResponsePB::StatusAndSchemaPB> tablets;
+ ASSERT_OK(WaitForNumTabletsOnTS(ts, 1, kTimeout, &tablets));
+ string tablet_id = tablets[0].tablet_status().tablet_id();
+
+ // Ensure all the servers agree before we proceed.
+ ASSERT_OK(WaitForServersToAgree(kTimeout, ts_map_, tablet_id,
+ workload.batches_completed()));
+
+ // Find the leader so we can tombstone a follower, which makes the test faster and more focused.
+ int leader_index;
+ int follower_index;
+ TServerDetails* leader_ts;
+ TServerDetails* follower_ts;
+ ASSERT_OK(FindTabletLeader(ts_map_, tablet_id, kTimeout, &leader_ts));
+ leader_index = cluster_->tablet_server_index_by_uuid(leader_ts->uuid());
+ follower_index = (leader_index + 1) % cluster_->num_tablet_servers();
+ follower_ts = ts_map_[cluster_->tablet_server(follower_index)->uuid()];
+
+ // State: 1 running tablet.
+ ASSERT_EVENTUALLY([&] {
+ ASSERT_EQ(1, CountRunningTablets(cluster_->tablet_server(follower_index)));
+ });
+
+ // Tombstone the tablet on the follower.
+ ASSERT_OK(itest::DeleteTablet(follower_ts, tablet_id,
+ TABLET_DATA_TOMBSTONED,
+ boost::none, kTimeout));
+
+ // State: 0 running tablets.
+ ASSERT_EVENTUALLY([&] {
+ ASSERT_EQ(0, CountRunningTablets(cluster_->tablet_server(follower_index)));
+ });
+
+ // Wait for the tablet to be revived via tablet copy.
+ ASSERT_OK(inspect_->WaitForTabletDataStateOnTS(
+ follower_index, tablet_id,
+ { tablet::TABLET_DATA_READY },
+ kTimeout));
+
+ // State: 1 running or bootstrapping tablet.
+ ASSERT_EVENTUALLY([&] {
+ ASSERT_EQ(1, CountRunningTablets(cluster_->tablet_server(follower_index)) +
+ CountBootstrappingTablets(cluster_->tablet_server(follower_index)));
+ });
+}
+
} // namespace kudu
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/tserver/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/CMakeLists.txt b/src/kudu/tserver/CMakeLists.txt
index 84daec8..048a237 100644
--- a/src/kudu/tserver/CMakeLists.txt
+++ b/src/kudu/tserver/CMakeLists.txt
@@ -114,6 +114,7 @@ set(TSERVER_SRCS
tablet_server_options.cc
tablet_service.cc
ts_tablet_manager.cc
+ ts_tablet_manager_metrics.cc
tserver-path-handlers.cc
)
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/tserver/ts_tablet_manager.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/ts_tablet_manager.cc b/src/kudu/tserver/ts_tablet_manager.cc
index d8d4bd4..7cab0b4 100644
--- a/src/kudu/tserver/ts_tablet_manager.cc
+++ b/src/kudu/tserver/ts_tablet_manager.cc
@@ -17,7 +17,6 @@
#include "kudu/tserver/ts_tablet_manager.h"
-#include <algorithm>
#include <cstdint>
#include <memory>
#include <mutex>
@@ -112,6 +111,11 @@ DEFINE_double(fault_crash_after_tc_files_fetched, 0.0,
"(For testing only!)");
TAG_FLAG(fault_crash_after_tc_files_fetched, unsafe);
+DEFINE_int32(tablet_state_walk_min_period_ms, 1000,
+ "Minimum amount of time in milliseconds between walks of the "
+ "tablet map to update tablet state counts.");
+TAG_FLAG(tablet_state_walk_min_period_ms, advanced);
+
using std::shared_ptr;
using std::string;
using std::vector;
@@ -155,8 +159,8 @@ TSTabletManager::TSTabletManager(TabletServer* server)
server_(server),
metric_registry_(server->metric_registry()),
tablet_copy_metrics_(server->metric_entity()),
- state_(MANAGER_INITIALIZING) {
-}
+ tablet_manager_metrics_(server->metric_entity(), this),
+ state_(MANAGER_INITIALIZING) {}
TSTabletManager::~TSTabletManager() {
}
@@ -1166,6 +1170,48 @@ void TSTabletManager::FailTabletsInDataDir(const string& uuid) {
dd_manager->FindDataDirByUuidIndex(uuid_idx)->dir());
}
+void TSTabletManager::RefreshTabletStateCache() {
+ MonoDelta period = MonoDelta::FromMilliseconds(FLAGS_tablet_state_walk_min_period_ms);
+ std::lock_guard<rw_spinlock> lock(lock_);
+ // Cache is fresh enough; don't regenerate counts.
+ if (last_walked_ + period > MonoTime::Now()) {
+ return;
+ }
+ tablet_manager_metrics_.ResetTabletStateCounts();
+ for (const auto& entry : tablet_map_) {
+ switch (entry.second->state()) {
+ case tablet::NOT_INITIALIZED:
+ tablet_manager_metrics_.num_not_initialized++;
+ break;
+ case tablet::INITIALIZED:
+ tablet_manager_metrics_.num_initialized++;
+ break;
+ case tablet::BOOTSTRAPPING:
+ tablet_manager_metrics_.num_bootstrapping++;
+ break;
+ case tablet::RUNNING:
+ tablet_manager_metrics_.num_running++;
+ break;
+ case tablet::FAILED:
+ tablet_manager_metrics_.num_failed++;
+ break;
+ case tablet::STOPPING:
+ tablet_manager_metrics_.num_stopping++;
+ break;
+ case tablet::STOPPED:
+ tablet_manager_metrics_.num_stopped++;
+ break;
+ case tablet::SHUTDOWN:
+ tablet_manager_metrics_.num_shutdown++;
+ break;
+ case tablet::UNKNOWN:
+ // pass
+ break;
+ }
+ }
+ last_walked_ = MonoTime::Now();
+}
+
TransitionInProgressDeleter::TransitionInProgressDeleter(
TransitionInProgressMap* map, rw_spinlock* lock, string entry)
: in_progress_(map), lock_(lock), entry_(std::move(entry)) {}
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/tserver/ts_tablet_manager.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/ts_tablet_manager.h b/src/kudu/tserver/ts_tablet_manager.h
index f2a0795..e7ce2cf 100644
--- a/src/kudu/tserver/ts_tablet_manager.h
+++ b/src/kudu/tserver/ts_tablet_manager.h
@@ -33,9 +33,11 @@
#include "kudu/tablet/metadata.pb.h"
#include "kudu/tserver/tablet_copy_client.h"
#include "kudu/tserver/tablet_replica_lookup.h"
+#include "kudu/tserver/ts_tablet_manager_metrics.h"
#include "kudu/tserver/tserver.pb.h"
#include "kudu/tserver/tserver_admin.pb.h"
#include "kudu/util/locks.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/status.h"
namespace boost {
@@ -79,9 +81,9 @@ class TransitionInProgressDeleter;
// Keeps track of the tablets hosted on the tablet server side.
//
-// TODO: will also be responsible for keeping the local metadata about
-// which tablets are hosted on this server persistent on disk, as well
-// as re-opening all the tablets at startup, etc.
+// TODO(todd): will also be responsible for keeping the local metadata about which
+// tablets are hosted on this server persistent on disk, as well as re-opening all
+// the tablets at startup, etc.
class TSTabletManager : public tserver::TabletReplicaLookupIf {
public:
// Construct the tablet manager.
@@ -199,6 +201,9 @@ class TSTabletManager : public tserver::TabletReplicaLookupIf {
// Forces shutdown of the tablet replicas in the data dir corresponding to 'uuid'.
void FailTabletsInDataDir(const std::string& uuid);
+ // Refresh the cached counts of tablet states, if the cache is old enough.
+ void RefreshTabletStateCache();
+
private:
FRIEND_TEST(TsTabletManagerTest, TestPersistBlocks);
@@ -307,12 +312,20 @@ class TSTabletManager : public tserver::TabletReplicaLookupIf {
typedef std::unordered_map<std::string, scoped_refptr<tablet::TabletReplica> > TabletMap;
// Lock protecting tablet_map_, dirty_tablets_, state_,
- // transition_in_progress_, and perm_deleted_tablet_ids_.
+ // transition_in_progress_, perm_deleted_tablet_ids_,
+ // tablet_manager_metrics_, and last_walked_.
mutable rw_spinlock lock_;
// Map from tablet ID to tablet
TabletMap tablet_map_;
+ // Timestamp indicating the last time tablet_map_ was walked to count
+ // tablet states.
+ MonoTime last_walked_ = MonoTime::Min();
+
+ // Metrics container for the tablet manager; holds cached tablet states from tablet_map_.
+ TSTabletManagerMetrics tablet_manager_metrics_;
+
// Permanently deleted tablet ids. If a tablet is removed with status
// TABLET_DATA_DELETED then it is added to this map (until the next process
// restart).
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/tserver/ts_tablet_manager_metrics.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/ts_tablet_manager_metrics.cc b/src/kudu/tserver/ts_tablet_manager_metrics.cc
new file mode 100644
index 0000000..74df6ca
--- /dev/null
+++ b/src/kudu/tserver/ts_tablet_manager_metrics.cc
@@ -0,0 +1,158 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "kudu/tserver/ts_tablet_manager_metrics.h"
+
+#include "kudu/gutil/bind.h"
+#include "kudu/gutil/bind_helpers.h"
+#include "kudu/tserver/ts_tablet_manager.h"
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_not_initialized,
+ "Number of Not Initialized Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of tablets currently not initialized");
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_initialized,
+ "Number of Initialized Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of tablets currently initialized");
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_bootstrapping,
+ "Number of Bootstrapping Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of tablets currently bootstrapping");
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_running,
+ "Number of Running Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of tablets currently running");
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_failed,
+ "Number of Failed Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of failed tablets");
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_stopping,
+ "Number of Stopping Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of tablets currently stopping");
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_stopped,
+ "Number of Stopped Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of tablets currently stopped");
+
+METRIC_DEFINE_gauge_int32(server, tablets_num_shutdown,
+ "Number of Shut Down Tablets",
+ kudu::MetricUnit::kTablets,
+ "Number of tablets currently shut down");
+
+namespace kudu {
+namespace tserver {
+
+TSTabletManagerMetrics::TSTabletManagerMetrics(const scoped_refptr<MetricEntity>& metric_entity,
+ TSTabletManager* ts_tablet_manager) :
+ ts_tablet_manager_(ts_tablet_manager) {
+ METRIC_tablets_num_not_initialized.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumNotInitializedTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+ METRIC_tablets_num_initialized.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumInitializedTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+ METRIC_tablets_num_bootstrapping.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumBootstrappingTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+ METRIC_tablets_num_running.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumRunningTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+ METRIC_tablets_num_failed.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumFailedTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+ METRIC_tablets_num_stopping.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumStoppingTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+ METRIC_tablets_num_stopped.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumStoppedTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+ METRIC_tablets_num_shutdown.InstantiateFunctionGauge(
+ metric_entity,
+ Bind(&TSTabletManagerMetrics::NumShutdownTablets, Unretained(this)))
+ ->AutoDetach(&metric_detacher_);
+
+ ResetTabletStateCounts();
+}
+
+int TSTabletManagerMetrics::NumNotInitializedTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_not_initialized;
+}
+
+int TSTabletManagerMetrics::NumInitializedTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_initialized;
+}
+
+int TSTabletManagerMetrics::NumBootstrappingTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_bootstrapping;
+}
+
+int TSTabletManagerMetrics::NumRunningTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_running;
+}
+
+int TSTabletManagerMetrics::NumFailedTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_failed;
+}
+
+int TSTabletManagerMetrics::NumStoppingTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_stopping;
+}
+
+int TSTabletManagerMetrics::NumStoppedTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_stopped;
+}
+
+int TSTabletManagerMetrics::NumShutdownTablets() {
+ ts_tablet_manager_->RefreshTabletStateCache();
+ return num_shutdown;
+}
+
+void TSTabletManagerMetrics::ResetTabletStateCounts() {
+ num_not_initialized = 0;
+ num_initialized = 0;
+ num_bootstrapping = 0;
+ num_running = 0;
+ num_failed = 0;
+ num_stopping = 0;
+ num_stopped = 0;
+ num_shutdown = 0;
+}
+
+} // namespace tserver
+} // namespace kudu
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/tserver/ts_tablet_manager_metrics.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/ts_tablet_manager_metrics.h b/src/kudu/tserver/ts_tablet_manager_metrics.h
new file mode 100644
index 0000000..47218b9
--- /dev/null
+++ b/src/kudu/tserver/ts_tablet_manager_metrics.h
@@ -0,0 +1,63 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#pragma once
+
+#include "kudu/gutil/ref_counted.h"
+#include "kudu/util/metrics.h"
+
+namespace kudu {
+namespace tserver {
+
+class TSTabletManager;
+
+// A container for tablet manager metrics.
+struct TSTabletManagerMetrics {
+ TSTabletManagerMetrics(const scoped_refptr<MetricEntity>& metric_entity,
+ TSTabletManager* ts_tablet_manager);
+
+ // Functions that return their respective tablet state count and potentially
+ // refresh the counts from ts_tablet_manager_.
+ int NumNotInitializedTablets();
+ int NumInitializedTablets();
+ int NumBootstrappingTablets();
+ int NumRunningTablets();
+ int NumFailedTablets();
+ int NumStoppingTablets();
+ int NumStoppedTablets();
+ int NumShutdownTablets();
+
+ void ResetTabletStateCounts();
+
+ // Cached tablet state counts computed from ts_tablet_manager_.
+ int num_not_initialized;
+ int num_initialized;
+ int num_bootstrapping;
+ int num_running;
+ int num_failed;
+ int num_stopping;
+ int num_stopped;
+ int num_shutdown;
+
+ private:
+ TSTabletManager* ts_tablet_manager_;
+
+ FunctionGaugeDetacher metric_detacher_;
+};
+
+} // namespace tserver
+} // namespace kudu
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/util/metrics.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/metrics.cc b/src/kudu/util/metrics.cc
index c231fd3..06fca86 100644
--- a/src/kudu/util/metrics.cc
+++ b/src/kudu/util/metrics.cc
@@ -109,6 +109,8 @@ const char* MetricUnit::Name(Type unit) {
return "state";
case kSessions:
return "sessions";
+ case kTablets:
+ return "tablets";
default:
DCHECK(false) << "Unknown unit with type = " << unit;
return "UNKNOWN UNIT";
http://git-wip-us.apache.org/repos/asf/kudu/blob/6fef9ca5/src/kudu/util/metrics.h
----------------------------------------------------------------------
diff --git a/src/kudu/util/metrics.h b/src/kudu/util/metrics.h
index 9752c9c..ef2b339 100644
--- a/src/kudu/util/metrics.h
+++ b/src/kudu/util/metrics.h
@@ -388,6 +388,7 @@ struct MetricUnit {
kDataDirectories,
kState,
kSessions,
+ kTablets,
};
static const char* Name(Type unit);
};
[2/2] kudu git commit: rename suicide_on_eio flag to crash_on_eio
Posted by ad...@apache.org.
rename suicide_on_eio flag to crash_on_eio
The name `suicide_on_eio` seems a bit controversial/insensitive. As we
move forward in documenting its usage with disk failures, it's probably
best rename it.
Change-Id: I6c83156865b0f8ac80a20701558119ace6c05399
Reviewed-on: http://gerrit.cloudera.org:8080/7994
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/eed74ee6
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/eed74ee6
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/eed74ee6
Branch: refs/heads/master
Commit: eed74ee6c640221b050fe188b5473f95366ac0e2
Parents: 6fef9ca
Author: Andrew Wong <aw...@cloudera.com>
Authored: Thu Sep 7 01:54:37 2017 -0700
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Thu Sep 14 03:26:50 2017 +0000
----------------------------------------------------------------------
docs/release_notes.adoc | 2 +-
src/kudu/fs/block_manager-test.cc | 4 ++--
src/kudu/fs/data_dirs-test.cc | 4 ++--
src/kudu/fs/fs_manager-test.cc | 6 +++---
src/kudu/fs/log_block_manager-test.cc | 4 ++--
src/kudu/integration-tests/disk_failure-itest.cc | 2 +-
src/kudu/util/env-test.cc | 4 ++--
src/kudu/util/env_posix.cc | 10 +++++-----
8 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/docs/release_notes.adoc
----------------------------------------------------------------------
diff --git a/docs/release_notes.adoc b/docs/release_notes.adoc
index 9547186..d033e35 100644
--- a/docs/release_notes.adoc
+++ b/docs/release_notes.adoc
@@ -66,7 +66,7 @@
startup. This feature is experimental; by default, Kudu will crash if it
experiences a disk failure. When enabled, tablets with any data on the failed
disk will not be opened and will be replicated as needed. To enable this, set
- the `--suicide_on_eio` flag to `false`. Additionally, there is a configurable
+ the `--crash_on_eio` flag to `false`. Additionally, there is a configurable
tradeoff between a newly added tablet's tolerance to disk failures and its
parallelization of I/O via the `--fs_target_data_dirs_per_tablet` flag.
Tablets that are spread across fewer disks are less likely to be affected by a
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/src/kudu/fs/block_manager-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/block_manager-test.cc b/src/kudu/fs/block_manager-test.cc
index 91fd210..0ffd69b 100644
--- a/src/kudu/fs/block_manager-test.cc
+++ b/src/kudu/fs/block_manager-test.cc
@@ -76,7 +76,7 @@ DECLARE_int32(fs_data_dirs_full_disk_cache_seconds);
DECLARE_int32(fs_target_data_dirs_per_tablet);
DECLARE_string(block_manager);
DECLARE_double(env_inject_eio);
-DECLARE_bool(suicide_on_eio);
+DECLARE_bool(crash_on_eio);
// Generic block manager metrics.
METRIC_DECLARE_gauge_uint64(block_manager_blocks_open_reading);
@@ -870,7 +870,7 @@ TYPED_TEST(BlockManagerTest, TestMetadataOkayDespiteFailure) {
FLAGS_log_container_preallocate_bytes = 8 * 1024;
// Force some file operations to fail.
- FLAGS_suicide_on_eio = false;
+ FLAGS_crash_on_eio = false;
FLAGS_env_inject_eio = 0.1;
// Compact log block manager metadata aggressively at startup; injected
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/src/kudu/fs/data_dirs-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/data_dirs-test.cc b/src/kudu/fs/data_dirs-test.cc
index 8f22778..c6dd144 100644
--- a/src/kudu/fs/data_dirs-test.cc
+++ b/src/kudu/fs/data_dirs-test.cc
@@ -50,7 +50,7 @@ using std::vector;
using std::unique_ptr;
using strings::Substitute;
-DECLARE_bool(suicide_on_eio);
+DECLARE_bool(crash_on_eio);
DECLARE_double(env_inject_eio);
DECLARE_int32(fs_data_dirs_full_disk_cache_seconds);
DECLARE_int32(fs_target_data_dirs_per_tablet);
@@ -395,7 +395,7 @@ TEST_F(DataDirManagerTest, TestOpenWithFailedDirs) {
DataDirManagerOptions(), &dd_manager_));
// Kill the first non-metadata directory.
- FLAGS_suicide_on_eio = false;
+ FLAGS_crash_on_eio = false;
FLAGS_env_inject_eio = 1.0;
FLAGS_env_inject_eio_globs = JoinPathSegments(test_roots_[1], "**");
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/src/kudu/fs/fs_manager-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/fs_manager-test.cc b/src/kudu/fs/fs_manager-test.cc
index 9612826..beba6f1 100644
--- a/src/kudu/fs/fs_manager-test.cc
+++ b/src/kudu/fs/fs_manager-test.cc
@@ -58,7 +58,7 @@ using std::unordered_set;
using std::vector;
using strings::Substitute;
-DECLARE_bool(suicide_on_eio);
+DECLARE_bool(crash_on_eio);
DECLARE_double(env_inject_eio);
DECLARE_string(env_inject_eio_globs);
DECLARE_string(umask);
@@ -271,7 +271,7 @@ TEST_F(FsManagerTestBase, TestCreateWithFailedDirs) {
// canonicalization by failing the dirname.
vector<string> data_roots = JoinPathSegmentsV(data_paths, "root");
- FLAGS_suicide_on_eio = false;
+ FLAGS_crash_on_eio = false;
FLAGS_env_inject_eio = 1.0;
// Fail a directory, avoiding the metadata directory.
@@ -296,7 +296,7 @@ TEST_F(FsManagerTestBase, TestOpenWithFailedDirs) {
ASSERT_OK(fs_manager()->CreateInitialFileSystemLayout());
// Now fail one of the directories.
- FLAGS_suicide_on_eio = false;
+ FLAGS_crash_on_eio = false;
FLAGS_env_inject_eio = 1.0;
FLAGS_env_inject_eio_globs = JoinPathSegments(Substitute("$0,$0", data_paths[1]), "**");
ReinitFsManager(wal_path, data_roots);
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/src/kudu/fs/log_block_manager-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/log_block_manager-test.cc b/src/kudu/fs/log_block_manager-test.cc
index 9401758..a69f026 100644
--- a/src/kudu/fs/log_block_manager-test.cc
+++ b/src/kudu/fs/log_block_manager-test.cc
@@ -72,7 +72,7 @@ using std::vector;
using strings::Substitute;
DECLARE_bool(cache_force_single_shard);
-DECLARE_bool(suicide_on_eio);
+DECLARE_bool(crash_on_eio);
DECLARE_double(env_inject_eio);
DECLARE_double(log_container_excess_space_before_cleanup_fraction);
DECLARE_double(log_container_live_metadata_before_compact_ratio);
@@ -1329,7 +1329,7 @@ TEST_F(LogBlockManagerTest, TestOpenWithFailedDirectories) {
bm_.reset(CreateBlockManager(nullptr));
// Fail one of the directories, chosen randomly.
- FLAGS_suicide_on_eio = false;
+ FLAGS_crash_on_eio = false;
FLAGS_env_inject_eio = 1;
int failed_idx = Random(SeedRandom()).Next() % kNumDirs;
FLAGS_env_inject_eio_globs = JoinPathSegments(test_dirs[failed_idx], "**");
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/src/kudu/integration-tests/disk_failure-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/disk_failure-itest.cc b/src/kudu/integration-tests/disk_failure-itest.cc
index cfa337d..a59f4a5 100644
--- a/src/kudu/integration-tests/disk_failure-itest.cc
+++ b/src/kudu/integration-tests/disk_failure-itest.cc
@@ -89,7 +89,7 @@ TEST_F(DiskFailureITest, TestFailDuringServerStartup) {
vector<string> extra_flags = {
Substitute("--env_inject_eio_globs=$0", JoinPathSegments(failed_dir, "**")),
"--env_inject_eio=1.0",
- "--suicide_on_eio=false",
+ "--crash_on_eio=false",
};
ts->mutable_flags()->insert(ts->mutable_flags()->begin(), extra_flags.begin(), extra_flags.end());
ts->Shutdown();
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/src/kudu/util/env-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/env-test.cc b/src/kudu/util/env-test.cc
index a6d4294..6c30dce 100644
--- a/src/kudu/util/env-test.cc
+++ b/src/kudu/util/env-test.cc
@@ -66,7 +66,7 @@
#include "kudu/util/test_util.h"
DECLARE_bool(never_fsync);
-DECLARE_bool(suicide_on_eio);
+DECLARE_bool(crash_on_eio);
DECLARE_double(env_inject_eio);
DECLARE_int32(env_inject_short_read_bytes);
DECLARE_int32(env_inject_short_write_bytes);
@@ -1046,7 +1046,7 @@ TEST_F(TestEnv, TestGetExtentMap) {
TEST_F(TestEnv, TestInjectEIO) {
// Use two files to fail with.
- FLAGS_suicide_on_eio = false;
+ FLAGS_crash_on_eio = false;
const string kTestRWPath1 = GetTestPath("test_env_rw_file1");
unique_ptr<RWFile> rw1;
ASSERT_OK(env_->NewRWFile(kTestRWPath1, &rw1));
http://git-wip-us.apache.org/repos/asf/kudu/blob/eed74ee6/src/kudu/util/env_posix.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/env_posix.cc b/src/kudu/util/env_posix.cc
index 3d45c13..9dd5e2b 100644
--- a/src/kudu/util/env_posix.cc
+++ b/src/kudu/util/env_posix.cc
@@ -73,8 +73,8 @@
#include <linux/falloc.h>
#include <linux/fiemap.h>
#include <linux/fs.h>
-#include <linux/kernel.h>
#include <linux/magic.h>
+#include <linux/sysinfo.h>
#include <sys/ioctl.h>
#include <sys/sysinfo.h>
#include <sys/vfs.h> // IWYU pragma: keep
@@ -168,12 +168,12 @@ DEFINE_bool(env_use_ioctl_hole_punch_on_xfs, true,
TAG_FLAG(env_use_ioctl_hole_punch_on_xfs, advanced);
TAG_FLAG(env_use_ioctl_hole_punch_on_xfs, experimental);
-DEFINE_bool(suicide_on_eio, true,
+DEFINE_bool(crash_on_eio, true,
"Kill the process if an I/O operation results in EIO. If false, "
"I/O resulting in EIOs will return the status IOError and leave "
"error-handling up to the caller.");
-TAG_FLAG(suicide_on_eio, advanced);
-TAG_FLAG(suicide_on_eio, experimental);
+TAG_FLAG(crash_on_eio, advanced);
+TAG_FLAG(crash_on_eio, experimental);
DEFINE_bool(never_fsync, false,
"Never fsync() anything to disk. This is used by certain test cases to "
@@ -308,7 +308,7 @@ Status IOError(const std::string& context, int err_number) {
case EOPNOTSUPP:
return Status::NotSupported(context, ErrnoToString(err_number), err_number);
case EIO:
- if (FLAGS_suicide_on_eio) {
+ if (FLAGS_crash_on_eio) {
// TODO(awong): This is very, very coarse-grained. A more comprehensive
// approach is described in KUDU-616.
LOG(FATAL) << "Fatal I/O error, context: " << context;