osdc: clean up osd_command/start_mon_command interfaces #13727
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liewegas
approved these changes
Mar 1, 2017
liewegas
changed the title
|
/home/jenkins-build/build/workspace/ceph-pull-requests/src/librados/RadosClient.cc: In member function ‘int librados::RadosClient::osd_command(int, std::vector<std::basic_string >&, const bufferlist&, ceph::bufferlist*, std::string*)’: |
|
Oops, some of this got lost in another commit on #13725, fixing... |
tchaikov
approved these changes
Mar 2, 2017
liewegas
changed the title
liewegas
reviewed
Mar 6, 2017
src/librados/librados.cc
Outdated
| return client->osd_command(osdid, cmdvec, inbl, outbl, outs); | ||
| client->osd_command(osdid, cmdvec, inbl, outbl, outs); | ||
|
|
||
| return 0; |
There was a problem hiding this comment.
this is eating the return value
There was a problem hiding this comment.
i concur with @liewegas
@jcsp this breaks this test:
2017-03-08T15:57:53.322 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: [ RUN ] LibRadosCmd.OSDCmdPP
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: /build/ceph-12.0.0-1141-gc7d986e/src/test/librados/cmd.cc:146: Failure
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: Value of: r == -22 || r == -ENXIO
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: Actual: false
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: Expected: true
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: [ FAILED ] LibRadosCmd.OSDCmdPP (15 ms)
liewegas
reviewed
Mar 6, 2017
src/librados/librados.cc
Outdated
| if (ret) { | ||
| return ret; | ||
| } | ||
| client.mon_command(cmd, inbl, &outbl, &outstring); |
liewegas
requested changes
Mar 6, 2017
tchaikov
requested changes
Mar 9, 2017
src/librados/librados.cc
Outdated
| return client->osd_command(osdid, cmdvec, inbl, outbl, outs); | ||
| client->osd_command(osdid, cmdvec, inbl, outbl, outs); | ||
|
|
||
| return 0; |
There was a problem hiding this comment.
i concur with @liewegas
@jcsp this breaks this test:
2017-03-08T15:57:53.322 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: [ RUN ] LibRadosCmd.OSDCmdPP
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: /build/ceph-12.0.0-1141-gc7d986e/src/test/librados/cmd.cc:146: Failure
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: Value of: r == -22 || r == -ENXIO
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: Actual: false
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: Expected: true
2017-03-08T15:57:53.323 INFO:tasks.workunit.client.0.smithi156.stdout: api_cmd: [ FAILED ] LibRadosCmd.OSDCmdPP (15 ms)
added 6 commits
March 9, 2017 13:30
The int return was misleading because it didn't really have any error cases. We sometimes use ints in APIs in case we want to return an error in future, but Objecter is an internal interface. Signed-off-by: John Spray <john.spray@redhat.com>
The int return was misleading because it didn't really have any error cases. We sometimes use ints in APIs in case we want to return an error in future, but MonClient is an internal interface. Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
|
This is hopefully good now |
tchaikov
approved these changes
Mar 13, 2017
liewegas
approved these changes
Mar 13, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Functions that can't return errors should return void. I was using these interfaces from #13725 and didn't like writing in even more places where we would either assert(r==0) or do an error handling branch that would never get taken.