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

crush: a couple of weight-set fixes #16623

Merged
merged 3 commits into from Aug 1, 2017

Conversation

Projects
None yet
3 participants
@xiexingguo
Copy link
Member

xiexingguo commented Jul 27, 2017

No description provided.

@xiexingguo xiexingguo requested a review from liewegas Jul 27, 2017

@liewegas
Copy link
Member

liewegas left a comment

other patches look good.

i forgot about the config option for updating/not updating the weight set when i did my last round of updates.. i suspect it is not being applied consistently.

for (unsigned i = 0; i < b->size; ++i) {
carg.ids[i] = b->items[i];
}
}

This comment has been minimized.

Copy link
@liewegas

liewegas Jul 27, 2017

Member

I left this off deliberately since we don't have any users yet. When we do, we'll want to distinguish between choose_args that do and don't have ids... but for now we can leave them off all the time.

This comment has been minimized.

Copy link
@xiexingguo

xiexingguo Jul 27, 2017

Author Member

Dropped and repushed.

@liewegas liewegas added this to the luminous milestone Jul 27, 2017

@xiexingguo xiexingguo force-pushed the xiexingguo:wip-weightset branch from 1d2a98d to 85c9aa5 Jul 27, 2017

@liewegas liewegas added the needs-qa label Jul 27, 2017

@xiexingguo

This comment has been minimized.

Copy link
Member Author

xiexingguo commented Jul 27, 2017

retest this please

1 similar comment
@xiexingguo

This comment has been minimized.

Copy link
Member Author

xiexingguo commented Jul 27, 2017

retest this please

@liewegas

This comment has been minimized.

Copy link
Member

liewegas commented Jul 27, 2017

2017-07-27T19:06:28.220 INFO:tasks.workunit.client.0.smithi199.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/crush/crush-choose-args.sh:92: TEST_choose_args_update:  crushtool -d td/crush-choose-args/map-one-less -o td/crush-choose-args/map-one-less.txt
2017-07-27T19:06:28.248 INFO:tasks.workunit.client.0.smithi199.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/crush/crush-choose-args.sh:93: TEST_choose_args_update:  diff -u td/crush-choose-args/map-one-less.txt td/crush-choose-args/map.txt
2017-07-27T19:06:28.249 INFO:tasks.workunit.client.0.smithi199.stdout:--- td/crush-choose-args/map-one-less.txt 2017-07-27 19:06:28.242402756 +0000
2017-07-27T19:06:28.249 INFO:tasks.workunit.client.0.smithi199.stdout:+++ td/crush-choose-args/map.txt  2017-07-27 19:06:15.366481448 +0000
2017-07-27T19:06:28.249 INFO:tasks.workunit.client.0.smithi199.stdout:@@ -56,8 +56,8 @@
2017-07-27T19:06:28.249 INFO:tasks.workunit.client.0.smithi199.stdout:   {
2017-07-27T19:06:28.249 INFO:tasks.workunit.client.0.smithi199.stdout:     bucket_id -1
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:     weight_set [
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:-      [ 2.000 ]
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:-      [ 2.000 ]
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:+      [ 3.000 ]
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:+      [ 3.000 ]
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:     ]
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:     ids [ -10 ]
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stdout:   }
2017-07-27T19:06:28.250 INFO:tasks.workunit.client.0.smithi199.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/crush/crush-choose-args.sh:93: TEST_choose_args_update:  return 1

from /a/sage-2017-07-27_18:08:03-rados-wip-sage-testing-distro-basic-smithi/1453488

xiexingguo added some commits Jul 27, 2017

crush: avoid implicitly cast
pool-id may overflow(though actually can not happen...)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
mon/OSDMonitor: make error output more human-readable
Was:

./bin/ceph osd crush weight-set reweight rbd osd.0  1 2 3 4 5
Error ENOENT: weight_set_size != 5 for bucket -1weight_set_size != 5 for bucket -2weight_set_size != 5 for bucket -3weight_set_size != 5 for bucket -4item 0 not found in crush map

Now:
./bin/ceph osd crush weight-set reweight rbd osd.0  1 2 3 4 5
Error EINVAL: must specify exact 3 weight values

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

@xiexingguo xiexingguo force-pushed the xiexingguo:wip-weightset branch from 85c9aa5 to f8b6e02 Jul 29, 2017

@xiexingguo xiexingguo removed the DNM label Jul 29, 2017

@xiexingguo xiexingguo force-pushed the xiexingguo:wip-weightset branch from f8b6e02 to 4cf68db Jul 29, 2017

crush: clean up get_immediate_parent_id()
This is a follow-up cleanup of 9d908c1

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

@xiexingguo xiexingguo force-pushed the xiexingguo:wip-weightset branch from 4cf68db to 4736037 Jul 29, 2017

@xiexingguo xiexingguo added cleanup needs-qa and removed bug fix labels Jul 29, 2017

@xiexingguo

This comment has been minimized.

Copy link
Member Author

xiexingguo commented Jul 29, 2017

move the fix into a separate PR #16672

@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented Aug 1, 2017

@liewegas rados qa test passed, please merge it if you are good with the new commits also.

@liewegas liewegas merged commit dbf14eb into ceph:master Aug 1, 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

@xiexingguo xiexingguo deleted the xiexingguo:wip-weightset branch Aug 2, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.