Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test/osd/osd-fast-mark-down.sh: remove unnecessary teardown() calls #12101

Merged
merged 1 commit into from Nov 21, 2016

Conversation

tchaikov
Copy link
Contributor

main() does this for us.

Signed-off-by: Kefu Chai kchai@redhat.com

Copy link
Contributor

@branch-predictor branch-predictor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, accidental rocksdb submodule update?

return 1
fi
done
pkill -SIGTERM rados
teardown $dir || return 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this one in particular will cause entire test to fail, even if it actually succeeded, because OSDs are not cleaned up in subsequent sub-tests.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @branch-predictor . This is not typical of the structure of other tests but that's ok.

return 1
fi
done
pkill -SIGTERM rados
teardown $dir || return 1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @branch-predictor . This is not typical of the structure of other tests but that's ok.

main() does this for us.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Copy link
Contributor

@branch-predictor branch-predictor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM if tests pass.

@tchaikov
Copy link
Contributor Author

@dachary and @branch-predictor fixed and repushed.

@tchaikov tchaikov merged commit a70dc74 into ceph:master Nov 21, 2016
@tchaikov tchaikov deleted the wip-mark-down-test-cleanup branch November 21, 2016 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants