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.

Sign up for GitHub

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

Jump to bottom

mon: a few more upmap (and other) fixes #16239

Merged
merged 8 commits into from Jul 11, 2017
Merged

mon: a few more upmap (and other) fixes #16239

merged 8 commits into from Jul 11, 2017

Commits on Jul 10, 2017

  1. crush: fix potential weight overflow 

    E.g.:
./bin/ceph osd crush reweight osd.0 32768

ID WEIGHT      TYPE NAME                                            UP/DOWN REWEIGHT PRIMARY-AFFINITY
-4 32770.00000 root default~hdd
-3           -     host gitbuilder-ceph-rpm-centos7-amd64-basic~hdd
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000
-1 32770.00000 root default
-2           -     host gitbuilder-ceph-rpm-centos7-amd64-basic
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    7d07356 View commit details
    Browse the repository at this point in the history

  2. mon/OSDMonitor: improve "osd upmap" error message 

    by adding a explicit guide.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    b90d259 View commit details
    Browse the repository at this point in the history

  3. osd/OSDMap: apply both pg_upmap and pg_upmap_items 

    This allows a more flexible upmap policy by combinating
both pg_upmap and pg_upmap_items.

For example:
./bin/ceph osd pg-upmap 1.0 1 2 3
set 1.0 pg_upmap mapping to [1,2,3]

./bin/ceph osd pg-upmap-items 1.0 1 5
set 1.0 pg_upmap_items mapping to [1->5]

 ./bin/ceph pg ls-by-pool cephfs_data_a
PG_STAT OBJECTS MISSING_ON_PRIMARY DEGRADED MISPLACED UNFOUND BYTES LOG DISK_LOG STATE        STATE_STAMP                VERSION REPORTED UP      UP_PRIMARY ACTING  ACTING_PRIMARY
1.0           0                  0        0         0       0     0   0        0 active+clean 2017-07-10 11:04:53.955681     0'0    22:13 [5,2,3]          5 [5,2,3]              5

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    379e47e View commit details
    Browse the repository at this point in the history

  4. mon/OSDMonitor: guard "osd crush rule create-replicated" 

    require Luminous before using the crush device classes.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    6223dc9 View commit details
    Browse the repository at this point in the history

  5. mon/OSDMonitor: sanity check osd number before applying pg-temp 

    In case user did something stupid and causing weird results.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    5f9de0e View commit details
    Browse the repository at this point in the history

  6. mon/OSDMonitor: allow user to permanently delete pool 

    If mon_fake_pool_delete is enabled, "osd pool delete"
will unable to delete pool permanently, as we ask user
to pass in a "--yes-i-really-really-mean-it-no-faking"
string now.

The old "osd pool delete" command won't allow user to do this.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    2ce818a View commit details
    Browse the repository at this point in the history

  7. osd/OSDMap: fix potential divided-by-zero error 

    Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    5f7576c View commit details
    Browse the repository at this point in the history

  8. mon/OSDMonitor: dedup pg-upmap[-items] 

    Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Jul 10, 2017
    Copy the full SHA
    0b62c6b View commit details
    Browse the repository at this point in the history