Commit Graph

77440 Commits

Author SHA1 Message Date
songweibin
f1567a0fe2 osd/OSD: fix spell errors
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-21 14:58:15 +08:00
iliul
b0d4832314 .mailmap, .organizationmap: Add Liu Lei's mailmap and affiliation
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-08-21 10:47:37 +08:00
Haomai Wang
e7ec34bd89 Merge pull request #17086 from optimistyzy/818_write
bluestore/NVMEDevice: fix the bug in write function

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-08-21 09:49:57 +08:00
Kefu Chai
572575c3f7 Merge pull request #17104 from iliul/fix-duplicate-words
doc: delete duplicate words

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 18:16:34 +08:00
iliul
de19b555fa doc: delete duplicate words
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-08-20 17:30:55 +08:00
zhangwen
574c2e0349 common: Destroy attr of RWLock after initialized
Signed-off-by: Wen Zhang <zhangwen1@unionpay.com>
2017-08-20 16:58:07 +08:00
Kefu Chai
e407049a6a Merge pull request #17060 from cyx1231st/fix_reqid_assignment_in_oprequest
osd: fix reqid assignment for reply messages in OpRequest

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 14:00:26 +08:00
Kefu Chai
d81816f969 Merge pull request #16687 from Songweibin/wip-xml-format
common: adding line break at end of some cli results

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-20 13:59:22 +08:00
Kefu Chai
689cf03f55 mon/OSDMonitor: do not send_pg_creates with stale info
we reset the "creating_pgs" with the newly accepted paxos proposal, but
the creating_pgs_by_osd_epoch is out-of-sync with the new creating_pgs.
so we are at risk of using stale creating_pgs_by_osd_epoch along with
the new creating_pgs.pgs. to avoid this racing, we need to check the
creating_pgs_epoch before sending pg-creates using
creating_pgs_by_osd_epoch.

Fixes: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-20 13:32:44 +08:00
Kefu Chai
257718556f Merge pull request #15118 from squidboylan/fix_15872
debian: lock ceph user during purge

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 10:16:43 +08:00
Kefu Chai
802e43bec8 Merge pull request #17059 from tchaikov/wip-optional-lz4
compressor: conditionalize on HAVE_LZ4

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-08-20 09:53:24 +08:00
Xie Xingguo
5b7c65d904 Merge pull request #17015 from lixiaoy1/lat_fix
os/bluestore: Add lat record of deferred_queued and deferred_aio_wait

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-19 21:01:47 +08:00
Xie Xingguo
89d28a176c Merge pull request #16955 from xiexingguo/wip-app-ls
mon/OSDMonitor: "osd pool application get" support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-19 17:49:43 +08:00
Xie Xingguo
e0e255f48e Merge pull request #17064 from xiexingguo/wip-20970
mon/PGMap: reweight::by_utilization - skip DNE osds

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-19 17:46:50 +08:00
Xie Xingguo
bda001fd2d Merge pull request #17067 from renhwztetecs/renhw-wip-mon-cleanup
mon: some cleanup

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-08-19 17:43:49 +08:00
xie xingguo
364178e716 mon/PGMap: fix "0 stuck requests are blocked > 4096 sec" warn
There are test cases I saw Ceph complained about:

2017-08-19 01:02:22.393763 mon.a mon.0 172.21.15.108:6789/0 279 : cluster [ERR] Health check failed: 0 stuck requests are blocked > 4096 sec (REQUEST_STUCK)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-19 10:54:09 +08:00
David Zafman
4ea1cd2a4e Merge pull request #17052 from dzafman/wip-pidfile
tests: Increase sleep in test_pidfile.sh

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-08-18 15:44:41 -07:00
Alfredo Deza
e33c1d9434 ceph-volume tests adapt tests for the new LVM api parser
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 17:21:33 -04:00
Alfredo Deza
23eaeb084c ceph-volume lvm.api uses the new parser for lvs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 17:10:54 -04:00
Alfredo Deza
5b93f98123 ceph-volume lvm.api uses the new parses for vgs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 17:08:30 -04:00
Alfredo Deza
b93afefc6a ceph-volume: lvm add a parser for the delimeted output in the CLI
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 17:05:45 -04:00
Jason Dillaman
9d7ff92b9a Merge pull request #15691 from vshankar/mirror-ha-policy
rbd-mirror: introduce basic image mapping policy

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-18 15:13:59 -04:00
David Zafman
599d7622dd tests: run-standalone.sh skip core_pattern if already set
If sudo requires a password it is nice to be able to avoid
sudo sysctl by setting core_pattern ahead of time.

Signed-off-by: David Zafman <dzafman@redhat.com>
2017-08-18 10:27:12 -07:00
Alfredo Deza
3ca95b6094 Merge pull request #17076 from ceph/toc-sidebar-fix
doc/templates update toctree call to include hidden entries

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2017-08-18 12:29:05 -04:00
Alfredo Deza
1e8e689ca7 Merge pull request #17093 from dzafman/wip-runs-message
tests: run-standalone.sh improve error message

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 12:08:17 -04:00
Alfredo Deza
9bb3397a58 doc update template call for toctree
Up until version 1.1.3 of Sphinx, this call would show hidden toctree
entries. Most of Ceph's toctree's are hidden, so when the version of
Sphinx was bumped to >1.6, the sidebar stopped showing entries

Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 12:05:03 -04:00
Kefu Chai
fbfd17b2fd Merge pull request #17026 from dzafman/wip-add-trap
tests: qa/standalone: Add trap for signals to restore the kernel core pattern

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 23:02:04 +08:00
lisali
1b90d57764 os/bluestore: Add lat record of deferred_queued and deferred_aio_wait
Originally bluestore defines the two lat deferred_queued_lat and
deferred_aio_wait_lat, but doesn't use it.
This patch is to add the records that each TXC stays on deferred queue
deferred ios.

Signed-off-by: Xiaoyan Li xiaoyan.li@intel.com
2017-08-18 09:51:35 -04:00
Venky Shankar
8647b37cbf rbd-mirror: load/update image map state machine
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-08-18 08:49:04 -04:00
Venky Shankar
64fa2c12c7 rbd-mirror: track on-disk image to instance map
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-08-18 08:49:04 -04:00
David Zafman
175b10795d tests: run-standalone.sh improve error message
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-08-18 03:49:42 -07:00
Ziye Yang
35e7955f80 NVMEDevice: fix the write bug
This patch can solve the write issue when we use spdk nvme driver
to handle I/Os from db bdev in the future.

Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-08-18 18:16:07 +08:00
Boris Ranto
32f28c96d0 Merge pull request #17070 from ktdreyer/rpm-macros-in-comments
rpm: rm macros in comments

Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-08-18 11:33:45 +02:00
xie xingguo
7e3528a9dc crush: force rebuilding shadow hierarchy after swapping buckets
Was:
---------------------------------------------------------------
ID CLASS WEIGHT  TYPE NAME
-8   ssd 3.00000 root fake-root~ssd
-6   ssd 3.00000     host fake~ssd
 0   ssd 1.00000         osd.0
 1   ssd 1.00000         osd.1
 2   ssd 1.00000         osd.2
-7       3.00000 root fake-root
-5       3.00000     host gitbuilder-ceph-rpm-centos7-amd64-basic
 3   ssd 1.00000         osd.3
 4   ssd 1.00000         osd.4
 5   ssd 1.00000         osd.5
-4   ssd 3.00000 root default~ssd
-3   ssd 3.00000     host gitbuilder-ceph-rpm-centos7-amd64-basic~ssd
 3   ssd 1.00000         osd.3
 4   ssd 1.00000         osd.4
 5   ssd 1.00000         osd.5
-1       3.00000 root default
-2       3.00000     host fake
 0   ssd 1.00000         osd.0
 1   ssd 1.00000         osd.1
 2   ssd 1.00000         osd.2

Now:
---------------------------------------------------------------
ID CLASS WEIGHT  TYPE NAME
-8   ssd 3.00000 root fake-root~ssd
-7   ssd 3.00000     host gitbuilder-ceph-rpm-centos7-amd64-basic~ssd
 3   ssd 1.00000         osd.3
 4   ssd 1.00000         osd.4
 5   ssd 1.00000         osd.5
-6       3.00000 root fake-root
-5       3.00000     host gitbuilder-ceph-rpm-centos7-amd64-basic
 3   ssd 1.00000         osd.3
 4   ssd 1.00000         osd.4
 5   ssd 1.00000         osd.5
-4   ssd 3.00000 root default~ssd
-3   ssd 3.00000     host fake~ssd
 0   ssd 1.00000         osd.0
 1   ssd 1.00000         osd.1
 2   ssd 1.00000         osd.2
-1       3.00000 root default
-2       3.00000     host fake
 0   ssd 1.00000         osd.0
 1   ssd 1.00000         osd.1
 2   ssd 1.00000         osd.2

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-18 14:47:39 +08:00
xie xingguo
6ae96d33a8 mon/PGMap: reweight::by_utilization - skip DNE osds
EC could set one or more members of acting set to CRUSH_ITEM_NONE,
which as a result can cause pgs_by_osd.resize() attempt to apply
for a large amount of memory which we can not afford.

Fix the above problem by always excluding a current DNE osd from
acting set.

Fixes: http://tracker.ceph.com/issues/20970
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-18 13:27:06 +08:00
Kefu Chai
8afca6dfa8 Merge pull request #17043 from renhwztetecs/renhw-wip-pgmap-pool
mon/pgmap: update pool nearfull display

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 11:32:41 +08:00
Kefu Chai
fd07d7bb5e Merge pull request #17002 from mychoxin/yuanxin_adjust_blockdevice
os/bluestore: move aio_callback{,_priv} to base class BlockDevice

Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 11:22:14 +08:00
Kefu Chai
405c73e59d Merge pull request #16940 from jcsp/wip-20955
mgr: add missing call to pick_addresses

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 11:14:37 +08:00
David Zafman
021177b790 Merge pull request #16407 from dzafman/wip-20243
osd: Improve size scrub error handling and ignore system attrs in xattr checking

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-17 20:05:40 -07:00
xie xingguo
968b72d859 crush: rebuild shadow trees on removing crush rule
In case this is the last crush rule which is still referencing
a specific device class. Otherwise the device class might stay
hanging.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-18 10:37:12 +08:00
Jos Collin
a96cb5b4da msg: drop unnecessary polling_stop()
Drop the unnecessary polling_stop() in the ~RDMAStack(). The RDMADispatcher object contained in
RDMAStack will get distroyed when RDMAStack gets distroyed. Thus ~RDMADispatcher() will be
called automatically and executes the polling_stop().

Fixes:
The below coverity scan reports.
1. CID 1416590:  Memory - corruptions
2. CID 1416593:  Memory - illegal accesses
3. CID 1416595:  Memory - corruptions
4. CID 1416597:  Memory - illegal accesses

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-08-18 07:02:40 +05:30
songweibin
19dd4203eb common: add new line break when get command descriptions
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-18 08:54:07 +08:00
songweibin
992829d38c rbd: adding newline operation when only '--format' used
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-18 08:54:07 +08:00
Jason Dillaman
5d3d5ea5ac test/librbd: TestMirroringWatcher unit tests should ignore duplicates
Fixes: http://tracker.ceph.com/issues/21029
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-08-17 18:39:05 -04:00
Jason Dillaman
1b21476f33 Merge pull request #17062 from trociny/wip-qa-rbd-mirror-data-pool
qa/workunits/rbd: test data pool is mirrored correctly

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-17 18:24:37 -04:00
Jason Dillaman
509ab39e82 Merge pull request #16517 from gohighsec/master
rbd: check if an image is already mapped before rbd map

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-17 18:10:47 -04:00
Jason Dillaman
9cdaa7ff0d Merge pull request #16591 from PCzhangPC/fix7
rbd: introduce commands of "image-meta ls/rm"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-17 18:08:44 -04:00
Jason Dillaman
1fe275f920 Merge pull request #17073 from dillaman/wip-20567
rbd-mirror: Set the data pool correctly when creating images

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-17 16:50:49 -04:00
J. Eric Ivancich
1c4df03394 osd: adjust osd_min_pg_log_entries
Return osd_min_pg_log_entries to its original values, which matches
osd_pg_log_dups_tracked, so the extended dup log is not used in the
general case.

This helps address: http://tracker.ceph.com/issues/21026

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-08-17 16:12:35 -04:00
Adam Wolfe Gordon
1af67b7529 doc: Update mirroring docs to mention data-pool configuration
Signed-off-by: Adam Wolfe Gordon <awg@digitalocean.com>
(cherry picked from commit 1e001c19e9)
2017-08-17 15:45:25 -04:00