Adar Dembo has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/8208 )
Change subject: itest: allow use of verifiers with EMCs that specify non-default block managers ...................................................................... itest: allow use of verifiers with EMCs that specify non-default block managers ClusterVerifier and LogVerifier both rely on opening a new FsManager, using the current FLAGS_block_manager of the caller process. ExternalMiniClusters, on the other hand, grant the flexibility to specify any flags, and create the cluster in a separate processes. This precluded the Verifiers from operating on ExternalMiniClusters that are specified with different block manager types than that of the Verifier's caller (e.g. in parameterized EMC tests). To remediate this, block manager type has been added to various constructor Options (i.e. ExternalMiniClusterOptions, ExternalDaemonOptions, FsManagerOpts, DataDirManagerOptions). This field is used by the Verifiers when opening a FsManager. There is also some cleanup of ExternalDaemon to store and use ExternalDaemonOptions instead of the individual members. To test, I parameterized disk_failure-itest, which exercises using a ClusterVerifier and LogVerifier, and restarts an ExternalTabletServer. Change-Id: Iaa44eb33d0c025830f97a2ed7583c8186f915e94 Reviewed-on: http://gerrit.cloudera.org:8080/8208 Reviewed-by: Adar Dembo <[email protected]> Tested-by: Kudu Jenkins Reviewed-by: Mike Percy <[email protected]> --- M src/kudu/fs/block_manager.h M src/kudu/fs/data_dirs.cc M src/kudu/fs/data_dirs.h M src/kudu/fs/fs_manager.cc M src/kudu/fs/fs_manager.h M src/kudu/integration-tests/disk_failure-itest.cc M src/kudu/integration-tests/disk_reservation-itest.cc M src/kudu/integration-tests/external_mini_cluster-itest-base.cc M src/kudu/integration-tests/external_mini_cluster-itest-base.h M src/kudu/integration-tests/log_verifier.cc M src/kudu/integration-tests/multidir_cluster-itest.cc M src/kudu/mini-cluster/external_mini_cluster.cc M src/kudu/mini-cluster/external_mini_cluster.h M src/kudu/server/server_base.cc 14 files changed, 166 insertions(+), 117 deletions(-) Approvals: Adar Dembo: Looks good to me, approved Kudu Jenkins: Verified Mike Percy: Looks good to me, approved -- To view, visit http://gerrit.cloudera.org:8080/8208 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: kudu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa44eb33d0c025830f97a2ed7583c8186f915e94 Gerrit-Change-Number: 8208 Gerrit-PatchSet: 8 Gerrit-Owner: Andrew Wong <[email protected]> Gerrit-Reviewer: Adar Dembo <[email protected]> Gerrit-Reviewer: Andrew Wong <[email protected]> Gerrit-Reviewer: Kudu Jenkins Gerrit-Reviewer: Mike Percy <[email protected]> Gerrit-Reviewer: Tidy Bot
