[2/2] kudu git commit: test_util: reset flags before cleaning test directory

2018-04-27 Thread granthenke 
test_util: reset flags before cleaning test directory

TabletServerDiskFailureTest.TestRandomOpSequence didn't reset
env_inject_eio to 0 before finishing. Rather than fixing that, let's change
KuduTest to reset its flags _before_ cleaning out the test directory. This
obviates the need for all such workarounds.

Change-Id: I4b4843cbc2c3bc2cbeb3a4d5959f80a35da7714a
Reviewed-on: http://gerrit.cloudera.org:8080/9944
Tested-by: Kudu Jenkins
Reviewed-by: Andrew Wong 
(cherry picked from commit 3f194c3a17f11a70e64bf2668a96e1e93fed00df)
Reviewed-on: http://gerrit.cloudera.org:8080/10229
Reviewed-by: Adar Dembo 
Tested-by: Grant Henke 


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/6a85da75
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/6a85da75
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/6a85da75

Branch: refs/heads/branch-1.7.x
Commit: 6a85da75c6a6f558047a913f248e2e264fdcd6e9
Parents: 9457b86
Author: Adar Dembo 
Authored: Fri Apr 6 10:41:26 2018 -0700
Committer: Grant Henke 
Committed: Fri Apr 27 16:29:37 2018 +

--
 src/kudu/fs/block_manager-test.cc |  2 --
 src/kudu/fs/data_dirs-test.cc |  1 -
 src/kudu/fs/fs_manager-test.cc| 24 +---
 src/kudu/fs/log_block_manager-test.cc | 14 --
 src/kudu/tablet/diskrowset-test.cc|  2 --
 src/kudu/util/test_util.cc|  4 
 src/kudu/util/test_util.h | 12 ++--
 7 files changed, 31 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kudu/blob/6a85da75/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 e17a61e..9d5a590 100644
--- a/src/kudu/fs/block_manager-test.cc
+++ b/src/kudu/fs/block_manager-test.cc
@@ -998,7 +998,6 @@ TYPED_TEST(BlockManagerTest, 
TestMetadataOkayDespiteFailure) {
  false /* create */));
 }
   }
-  FLAGS_env_inject_eio = 0;
 }
 
 TYPED_TEST(BlockManagerTest, TestGetAllBlockIds) {
@@ -1147,7 +1146,6 @@ TYPED_TEST(BlockManagerTest, TestBlockTransaction) {
   ASSERT_STR_CONTAINS(s.ToString(), Substitute("only deleted $0 blocks, "
"first failure",
deleted_blocks.size()));
-  FLAGS_env_inject_eio = 0;
 }
 
 } // namespace fs

http://git-wip-us.apache.org/repos/asf/kudu/blob/6a85da75/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 449780a..7d35f09 100644
--- a/src/kudu/fs/data_dirs-test.cc
+++ b/src/kudu/fs/data_dirs-test.cc
@@ -421,7 +421,6 @@ TEST_F(DataDirManagerTest, TestOpenWithFailedDirs) {
   DataDirManagerOptions(), _manager_);
   ASSERT_STR_CONTAINS(s.ToString(), "could not open directory manager");
   ASSERT_TRUE(s.IsIOError());
-  FLAGS_env_inject_eio = 0;
 }
 
 class TooManyDataDirManagerTest : public DataDirManagerTest {

http://git-wip-us.apache.org/repos/asf/kudu/blob/6a85da75/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 5c0b3a5..f92fb32 100644
--- a/src/kudu/fs/fs_manager-test.cc
+++ b/src/kudu/fs/fs_manager-test.cc
@@ -406,7 +406,6 @@ TEST_F(FsManagerTestBase, TestCreateWithFailedDirs) {
   Status s = fs_manager()->CreateInitialFileSystemLayout();
   ASSERT_STR_MATCHES(s.ToString(), "cannot create FS layout; at least one 
directory "
"failed to canonicalize");
-  FLAGS_env_inject_eio = 0;
 }
 
 TEST_F(FsManagerTestBase, TestOpenWithFailedDirs) {
@@ -428,8 +427,6 @@ TEST_F(FsManagerTestBase, TestOpenWithFailedDirs) {
   ReinitFsManagerWithPaths(wal_path, data_roots);
   ASSERT_OK(fs_manager()->Open(nullptr));
   ASSERT_EQ(1, fs_manager()->dd_manager()->GetFailedDataDirs().size());
-
-  FLAGS_env_inject_eio = 0;
 }
 
 TEST_F(FsManagerTestBase, TestTmpFilesCleanup) {
@@ -603,19 +600,16 @@ TEST_F(FsManagerTestBase, TestAddRemoveDataDirs) {
 
   // Try to open with a new data dir although an existing data dir has failed;
   // this should fail.
-  {
-google::FlagSaver saver;
-FLAGS_crash_on_eio = false;
-FLAGS_env_inject_eio = 1.0;
-FLAGS_env_inject_eio_globs = JoinPathSegments(new_path2, "**");
+  FLAGS_crash_on_eio = false;
+  FLAGS_env_inject_eio = 1.0;
+  FLAGS_env_inject_eio_globs = JoinPathSegments(new_path2, "**");
 
-const string new_path3 = GetTestPath("new_path3");
-opts.data_roots = {

kudu git commit: test_util: reset flags before cleaning test directory

2018-04-06 Thread adar 
Repository: kudu
Updated Branches:
  refs/heads/master 15afb6495 -> 3f194c3a1


test_util: reset flags before cleaning test directory

TabletServerDiskFailureTest.TestRandomOpSequence didn't reset
env_inject_eio to 0 before finishing. Rather than fixing that, let's change
KuduTest to reset its flags _before_ cleaning out the test directory. This
obviates the need for all such workarounds.

Change-Id: I4b4843cbc2c3bc2cbeb3a4d5959f80a35da7714a
Reviewed-on: http://gerrit.cloudera.org:8080/9944
Tested-by: Kudu Jenkins
Reviewed-by: Andrew Wong 


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/3f194c3a
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/3f194c3a
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/3f194c3a

Branch: refs/heads/master
Commit: 3f194c3a17f11a70e64bf2668a96e1e93fed00df
Parents: 15afb64
Author: Adar Dembo 
Authored: Fri Apr 6 10:41:26 2018 -0700
Committer: Adar Dembo 
Committed: Fri Apr 6 21:03:38 2018 +

--
 src/kudu/fs/block_manager-test.cc |  2 --
 src/kudu/fs/data_dirs-test.cc |  1 -
 src/kudu/fs/fs_manager-test.cc| 24 +---
 src/kudu/fs/log_block_manager-test.cc | 14 --
 src/kudu/tablet/diskrowset-test.cc|  2 --
 src/kudu/util/test_util.cc|  4 
 src/kudu/util/test_util.h | 12 ++--
 7 files changed, 31 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kudu/blob/3f194c3a/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 e17a61e..9d5a590 100644
--- a/src/kudu/fs/block_manager-test.cc
+++ b/src/kudu/fs/block_manager-test.cc
@@ -998,7 +998,6 @@ TYPED_TEST(BlockManagerTest, 
TestMetadataOkayDespiteFailure) {
  false /* create */));
 }
   }
-  FLAGS_env_inject_eio = 0;
 }
 
 TYPED_TEST(BlockManagerTest, TestGetAllBlockIds) {
@@ -1147,7 +1146,6 @@ TYPED_TEST(BlockManagerTest, TestBlockTransaction) {
   ASSERT_STR_CONTAINS(s.ToString(), Substitute("only deleted $0 blocks, "
"first failure",
deleted_blocks.size()));
-  FLAGS_env_inject_eio = 0;
 }
 
 } // namespace fs

http://git-wip-us.apache.org/repos/asf/kudu/blob/3f194c3a/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 449780a..7d35f09 100644
--- a/src/kudu/fs/data_dirs-test.cc
+++ b/src/kudu/fs/data_dirs-test.cc
@@ -421,7 +421,6 @@ TEST_F(DataDirManagerTest, TestOpenWithFailedDirs) {
   DataDirManagerOptions(), _manager_);
   ASSERT_STR_CONTAINS(s.ToString(), "could not open directory manager");
   ASSERT_TRUE(s.IsIOError());
-  FLAGS_env_inject_eio = 0;
 }
 
 class TooManyDataDirManagerTest : public DataDirManagerTest {

http://git-wip-us.apache.org/repos/asf/kudu/blob/3f194c3a/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 4952a6b..5a76883 100644
--- a/src/kudu/fs/fs_manager-test.cc
+++ b/src/kudu/fs/fs_manager-test.cc
@@ -406,7 +406,6 @@ TEST_F(FsManagerTestBase, TestCreateWithFailedDirs) {
   Status s = fs_manager()->CreateInitialFileSystemLayout();
   ASSERT_STR_MATCHES(s.ToString(), "cannot create FS layout; at least one 
directory "
"failed to canonicalize");
-  FLAGS_env_inject_eio = 0;
 }
 
 TEST_F(FsManagerTestBase, TestOpenWithNoBlockManagerInstances) {
@@ -458,8 +457,6 @@ TEST_F(FsManagerTestBase, TestOpenWithFailedDirs) {
   ReinitFsManagerWithPaths(wal_path, data_roots);
   ASSERT_OK(fs_manager()->Open(nullptr));
   ASSERT_EQ(1, fs_manager()->dd_manager()->GetFailedDataDirs().size());
-
-  FLAGS_env_inject_eio = 0;
 }
 
 TEST_F(FsManagerTestBase, TestTmpFilesCleanup) {
@@ -633,19 +630,16 @@ TEST_F(FsManagerTestBase, TestAddRemoveDataDirs) {
 
   // Try to open with a new data dir although an existing data dir has failed;
   // this should fail.
-  {
-google::FlagSaver saver;
-FLAGS_crash_on_eio = false;
-FLAGS_env_inject_eio = 1.0;
-FLAGS_env_inject_eio_globs = JoinPathSegments(new_path2, "**");
+  FLAGS_crash_on_eio = false;
+  FLAGS_env_inject_eio = 1.0;
+  FLAGS_env_inject_eio_globs = JoinPathSegments(new_path2, "**");
 
-const string new_path3 = GetTestPath("new_path3");
-opts.data_roots = { fs_root_, new_path2, new_path3 };
-ReinitFsManagerWithOpts(opts);
-Status s = fs_manager()->Open();
-