add(stats): add quorum property to zfs stats cmd (#276) (#277)

Signed-off-by: mittachaitu <sai.chaithanya@mayadata.io>
mayadata-io · Nov 8, 2019 · 2d2764e · 2d2764e
1 parent 55b3edc
commit 2d2764e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
@@ -392,6 +392,8 @@ uzfs_ioc_stats(zfs_cmd_t *zc, nvlist_t *nvl)
 			    zv->checkpointed_time);
 			fnvlist_add_uint64(innvl, "zvol_workers",
 			    zv->main_zv->zvol_workers);
+			fnvlist_add_uint64(innvl, "quorum",
+			    uzfs_zinfo_get_quorum(zv));
 
 			fnvlist_add_uint64(innvl, "rebuildBytes",
 			    zv->main_zv->rebuild_info.rebuild_bytes);

diff --git a/tests/cstor/gtest/test_zrepl_prot.cc b/tests/cstor/gtest/test_zrepl_prot.cc
@@ -1041,6 +1041,10 @@ TEST_F(ZreplDataTest, RebuildFlag) {
 	output = execCmd("zfs", std::string("stats ") + m_zvol_name1);
 	ASSERT_NE(output.find("Degraded"), std::string::npos);
 
+	/* volume is created with quorum off */
+	output = execCmd("zfs", std::string("stats ") + m_zvol_name1);
+	ASSERT_NE(output.find("\"quorum\":0"), std::string::npos);
+
 	/* transition the zvol to online state */
 	transition_zvol_to_online(m_ioseq1, m_control_fd1, m_zvol_name1);
 
@@ -1057,6 +1061,10 @@ TEST_F(ZreplDataTest, RebuildFlag) {
 	output = execCmd("zfs", std::string("stats ") + m_zvol_name1);
 	ASSERT_NE(output.find("Healthy"), std::string::npos);
 
+	/* Volume became healthy so quorum is expected to be 1 from stats*/
+	output = execCmd("zfs", std::string("stats ") + m_zvol_name1);
+	ASSERT_NE(output.find("\"quorum\":1"), std::string::npos);
+
 	/* read the block without rebuild flag */
 	read_data_start(m_datasock1.fd(), m_ioseq1, 0, sizeof (buf), &hdr_in, &read_hdr);
 	ASSERT_EQ(hdr_in.status, ZVOL_OP_STATUS_OK);