Commit Graph

69111 Commits

Author SHA1 Message Date
Loic Dachary
7f66672b67 ceph-disk: dmcrypt activate must use the same cluster as prepare
When dmcrypt is used, the fsid cannot be retrieved from the data
partition because it is encrypted. Store the fsid in the lockbox to
enable dmcrypt activation using the same logic as regular activation.

The fsid is used to retrive the cluster name that was used during
prepare, reason why activation does not and must not have a --cluster
argument.

Fixes: http://tracker.ceph.com/issues/17821

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2017-02-22 01:49:12 +01:00
Jason Dillaman
b4f36d5dc3 rbd-mirror: retry object copy after -ENOENT error
Fixes: http://tracker.ceph.com/issues/18990
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-02-21 18:42:54 -05:00
Jason Dillaman
9a91efc304 rbd-mirror: object copy should always reference valid snapshots
If a remote snapshot is deleted while an image sync is in-progress,
associate the read request against the most recent, valid remote
snapshot for a given snapshot object clone.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-02-21 18:42:54 -05:00
Jason Dillaman
0c181527c0 rbd-mirror: replace complex object op tuple with struct
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-02-21 18:42:54 -05:00
Nathan Cutler
374423e0ca Merge pull request #13515 from smithfarm/wip-17613
rpm: build ceph-resource-agents by default

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-02-22 00:13:20 +01:00
Abhishek Lekshmanan
2a79c6e5cc doc: add changelog for v0.94.10
Generated as
```
$ git log tags/v0.94.9..tags/v0.94.10 --after="Tue Aug 30 11:33:36 2016 +0000"
```

in order to avoid the qa suite merge commits
Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
2017-02-21 23:51:12 +01:00
Loic Dachary
d3409d4562 Revert "ceph-disk: change get_dmcrypt_key test to support different cluster name"
Merged by mistake, teuthology ceph-disk fails

This reverts commit 1c74747360.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2017-02-21 23:48:34 +01:00
Loic Dachary
bf6fca7591 Revert "ceph-disk: Adding cluster name support for dmcrypt"
Merged by mistake, teuthology ceph-disk fails

This reverts commit d98d4dbc27.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2017-02-21 23:47:25 +01:00
Yuri Weinstein
9d295f7588 Merge pull request #12623 from LiumxNL/fix-boot-epoch
osd: correct epoch setting of osd boot msg

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-21 13:01:23 -08:00
Yuri Weinstein
d0c5df3a87 Merge pull request #13418 from dreamhost/wip-18928
msg/async: support IPv6 QoS.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-02-21 12:59:42 -08:00
Yuri Weinstein
f0e93ea02e Merge pull request #13530 from tangwenjun3/wip-tang-nvme
os/bluestore rm unused variable in aio_read()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-21 12:57:14 -08:00
Sage Weil
e81f0e933a ceph_test_rados_api_misc: avoid livelock from PoolCreationRace
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-21 12:24:14 -06:00
Jason Dillaman
e2f14be298 Merge pull request #13536 from Liuchang0812/wip-add-override-in-rbd-headers
librbd: add override keyword in header files

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-21 11:51:50 -05:00
Kefu Chai
9341329781 Merge pull request #13558 from ceph/wip-19016-remove-mon_osd_min_down_reports
doc: remove mentions about mon_osd_min_down_reports

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-21 23:40:59 +08:00
Kefu Chai
445434048b Merge pull request #12295 from wjwithagen/wip-wjw-TEMP_FAILURE
rgw/rgw_main.cc: fix parenteses and function result

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-21 23:39:52 +08:00
Casey Bodley
70d1f90d79 Merge pull request #13291 from prallabh/obj_stat
rgw: Let the object stat command be shown in the usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-02-21 09:19:09 -05:00
Barbora Ančincová
2918439f57 doc: remove mentions about mon_osd_min_down_reports
Fixes: http://tracker.ceph.com/issues/19016
Signed-off-by: Bara Ancincova (bara@redhat.com)
2017-02-21 13:43:03 +01:00
Dongsheng Yang
02b13ff4a0 librbd: introduce TypeTraits in librbd/image
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-21 19:17:26 +08:00
Venky Shankar
1dadaeed02 librbd: add force option to DisableFeaturesRequest state machine
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-02-21 19:17:26 +08:00
Venky Shankar
7ac0d713c0 cls_rbd: async helper for dir_get_id()
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-02-21 19:17:26 +08:00
Dongsheng Yang
3d26d932af librbd: remove header when id missing
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-21 19:17:26 +08:00
Kefu Chai
d694b61d49 Merge pull request #13550 from tchaikov/wip-18968
mon/MonClient: persist global_id across re-connecting

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-02-21 17:22:42 +08:00
yonghengdexin735
686f5eba77 os/bluestore/BlueStore.cc:remove unuse code in _open_bdev()
Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
2017-02-21 16:55:23 +08:00
liuchang0812
f72b881249 librbd: add override in header files
Fixes: http://tracker.ceph.com/issues/19012

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-02-21 16:54:35 +08:00
songbaisen
88461ce6bc mon: crush straw_calc_version value is 0 or 1 not 0 to 2.
Signed-off-by: song baisen <song.baisen@zte.com.cn>
2017-02-21 08:44:49 +00:00
root
0fe76f83d1 rgw: Let the object stat command be shown in the usage
Fixes: http://tracker.ceph.com/issues/19013
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
2017-02-21 14:01:55 +05:30
songbaisen
8e309aaa99 osd: small clear up and optimize on _recover_now and should_share_map function
Signed-off-by: song baisen <song.baisen@zte.com.cn>
2017-02-21 08:31:15 +00:00
Samuel Just
2ed7759cfe PrimaryLogPG: reimplement osd_snap_trim_sleep within the state machine
Rather than blocking the main op queue, just pause for that amount of
time between state machine cycles.

Also, add osd_snap_trim_sleep to a few of the thrasher yamls.

Signed-off-by: Samuel Just <sjust@redhat.com>
2017-02-20 21:24:33 -08:00
Kefu Chai
8bb6193c8f mon/MonClient: persist global_id across re-connecting
MonClient should re-use previously assigned global-id after
re-connecting. and should not have its global-id changed once it is
authenticated unless monitor thinks otherwise.

Fixes: http://tracker.ceph.com/issues/18968
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-21 12:01:12 +08:00
John Spray
a4fcdb6133 Merge pull request #13346 from batrick/mds-doc-fix
doc: update to new ceph fs commands

Reviewed-by: John Spray <john.spray@redhat.com>
2017-02-20 23:58:55 +00:00
Matt Benjamin
ecb4820e07 Merge pull request #13529 from linuxbox2/wip-dir-orphan
rgw: wip dir orphan
2017-02-20 16:11:26 -05:00
Matt Benjamin
4454765e7d rgw_file: fix marker computation
Fixes: http://tracker.ceph.com/issues/19018

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-02-20 15:17:31 -05:00
Mykola Golub
357cea27af Merge pull request #13447 from dillaman/wip-13025
librbd: scatter/gather support for the C API

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-02-20 22:02:13 +02:00
Sage Weil
a4feab5e87 osd/OpRequest: make get_req() return const
Anybody who needs a mutable pointer should be calling get_nonconst_ref()
and justify themselves.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:08 -05:00
Sage Weil
a3f601cbad osd/PrimaryLogPG: cast const Message*'s where possible
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:08 -05:00
Sage Weil
d66aca0651 osd/PrimaryLogPG: annotate non-const MOSDOp casts
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:08 -05:00
Sage Weil
b8e7b108b2 osd/PGBackend: take const where we can
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:07 -05:00
Sage Weil
855cc87d09 osd/PG: cast const messages where we can
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:07 -05:00
Sage Weil
6a0fe7e615 osd: cast const Message*'s where we can
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:07 -05:00
Sage Weil
16e99f661d osd: constify misc messages
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:07 -05:00
Sage Weil
1f7f4de51c osd: constify handle_pg_info
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:07 -05:00
Sage Weil
8435311cb0 osd: constify handle_pg_create
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:06 -05:00
Sage Weil
db805f6f1c osd: constify handle_pg_query
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:06 -05:00
Sage Weil
6d9857cbc5 osd: constify handle_pg_remove
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:06 -05:00
Sage Weil
c8c6267fae osd: constify handle_pg_notify
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:06 -05:00
Sage Weil
854eee20e8 osd/PrimaryLogPG: non-const helpers where possible
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:06 -05:00
Sage Weil
19c52409e3 osd/PG: take const refs to pg info where possible
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:06 -05:00
Sage Weil
97c9b3a43e osd/ECBackend: cast const Message*'s where possible; annotate where not
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:05 -05:00
Sage Weil
cb76f60cae osd/ECBackend: constify
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:05 -05:00
Sage Weil
a61fcc4f8f osd/ReplicatedBackend: constify
In a few places we copy a bufferlist instead of stealing it.  This is
fast (it just came off the wire and is one buffer).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-20 14:22:05 -05:00