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

ceph.in, mgr: misc cleanups #16229

Merged
merged 2 commits into from Jul 10, 2017

Conversation

Projects
None yet
3 participants
@Liuchang0812
Contributor

Liuchang0812 commented Jul 9, 2017

No description provided.

set<string> modules;
PyModules::list_modules(&modules);
bool available = active_mgr != nullptr && active_mgr->is_initialized();
auto addr = available ? active_mgr->get_server_addr() : entity_addr_t();
dout(10) << "sending beacon as gid " << monc.get_global_id()
<< " modules " << modules << dendl;
<< " modules " << modules << dendl;

This comment has been minimized.

@tchaikov

tchaikov Jul 9, 2017

Contributor

https://github.com/ceph/ceph/blob/master/CodingStyle#L76, and please do not send formatting-only patches unless you happen to touch that area.

@@ -147,21 +147,21 @@ int MgrStandby::init()
void MgrStandby::send_beacon()
{
assert(lock.is_locked_by_me());
dout(1) << state_str() << dendl;
dout(4) << "state: " << state_str() << dendl;

This comment has been minimized.

@tchaikov

tchaikov Jul 9, 2017

Contributor

please put the rationale in the commit message.

@@ -172,6 +172,7 @@ ceph_send_command(PyObject *self, PyObject *args)
c);
return nullptr;
} else {
delete c;

This comment has been minimized.

@tchaikov

tchaikov Jul 9, 2017

Contributor

see #16227

This comment has been minimized.

@Liuchang0812

Liuchang0812 Jul 9, 2017

Contributor

cool, I will revert this commit

@Liuchang0812 Liuchang0812 changed the title from ceph, mgr: misc cleanups to ceph.in, mgr: misc cleanups Jul 9, 2017

print('[Contacting monitor, timeout after %d seconds]' % timeout)
if childargs and childargs[0] == 'ping':
if childargs and childargs[0] == 'ping' and not parsed_args.help:

This comment has been minimized.

@Liuchang0812

Liuchang0812 Jul 9, 2017

Contributor

fix "ceph ping --help" problem. We should list commands only with "ping" prefix.

 Monitor commands:
 =================
"ping" requires a monitor name as argument: "ping mon.<id>"

This comment has been minimized.

@Liuchang0812

Liuchang0812 Jul 9, 2017

Contributor

@tchaikov @dmick does it make sense? please take a look. thanks!

Liuchang0812 added some commits Jul 8, 2017

tool/ceph: print timeout tips iff verbose
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
mgr: remove useless headers in MgrStandby.h
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

@liewegas liewegas merged commit 7e12840 into ceph:master Jul 10, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment