RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,911 Commits 219 Branches 396 Tags 1.4 GiB
392c56c10e
Commit Graph

44911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spray
c1172cadab mon: fix auth get-or-create output 
Previously the caps were omitted from the
output: they should be present for this
to fulfil the 'get' part of get-or-create.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-09-18 18:46:05 +01:00
Samuel Just
7b2fa67a93 ReplicatedPG::get_snapset_context: set exists to false for new ssc with can_create 
Otherwise, if we do a proxy_write and don't promote it, the ssc will
stick around with exists = true and cause future reads on snaps for the
object to fail to fall through to the base tier.

Fixes: #13150
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-09-18 10:03:22 -07:00
Yehuda Sadeh
4a8b08d1dd rgw: don't read actual data on user manifest HEAD 
Fixes: #12780
We unconditionally read all the data, which is not needed
when doing HEAD operation on user manifest objects.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-09-18 18:56:36 +02:00
Sage Weil
bf9c00580f ceph-osd-prestart.sh: no ceph-disk chown 
chown -R ceph:ceph $1 is easy enough.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-09-18 11:40:26 -04:00
Sage Weil
a484bca60a Merge pull request #5980 from liewegas/wip-13059 
ceph.spec: fix up /var/run/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-18 11:06:24 -04:00
Boris Ranto
e44d1e07a7 ceph.spec.in: Fix up (/var)/run/ceph creation 
Fixes: #13059
Signed-off-by: Boris Ranto <branto@redhat.com>
 2015-09-18 11:02:46 -04:00
Kefu Chai
4ec586b8b4 Merge pull request #5977 from tchaikov/wip-size_t-monstore-txn 
mon: return size_t from MonitorDBStore::Transaction::size()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2015-09-18 22:32:41 +08:00
Sage Weil
1b3090d50e mon/OSDMonitor: fix crush injection error message 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-09-18 09:42:47 -04:00
Sage Weil
524b0bdcc4 mon/OSDMonitor: only test crush ruleset for the newly created pool 
Otherwise, we test *all* crush rules.. which might be a lot, and
which is a big waste of time and effort.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-09-18 09:41:25 -04:00
Sage Weil
aa238e5ed5 crush/CrushTester: allow testing by ruleset 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-09-18 09:40:13 -04:00
Haomai Wang
4f553b0e2b Librbd: Fix incorrect metadata filter behavior 
Signed-off-by: Haomai Wang <haomai@xsky.com>
 2015-09-18 17:20:23 +08:00
Kefu Chai
3971274b34 mon: return size_t from MonitorDBStore::Transaction::size() 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-09-18 17:05:09 +08:00
Jianpeng Ma
26fee819d0 osd/ReplicatedPG: using hobject_t::get_snapdir. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:44:51 +08:00
Jianpeng Ma
fd0a384c36 osd/ReplicatedPG: Using Hobject_t::get_head. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:44:51 +08:00
Jianpeng Ma
a326bd99b7 osd/ReplicatedPG: Remove the unuseful judgement in get_object_context. 
In this case, attrs always null. So it can remove this judgement.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:44:51 +08:00
Jianpeng Ma
6a4501b2f3 os/FileStore: s/::close(fd)/VOID_TEMP_FAILURE_RETRY(::close(fd)). 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:44:51 +08:00
Jianpeng Ma
0d26694125 osd/ReplicatedPG: Remove the duplicated code. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:44:50 +08:00
Jianpeng Ma
bdfb2391f4 osd/ReplicatedPG: Add verify checksum for SPARSE_READ. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:44:50 +08:00
Jianpeng Ma
8bfbcf6944 osd/ReplicatedPG:Optimize judgement when calc crc for read whole object. 
If extent.length == oi.size, this mean read success and read the whole
object. No need other conditions.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:44:50 +08:00
Jianpeng Ma
7532194372 osd/ReplicatedPG: for osd_op_create, if ob existed don't do t->touch. 
Although if ob existed, t->touch don't meet error. But this cause one
transaction include write journal.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-18 14:39:38 +08:00
Xie Rui
c1afc38550 unsigned type is short for journal max_size,use uint64_t instead. 
Signed-off-by: Xie Rui jerry.xr86@gmail.com
 2015-09-18 11:58:47 +08:00
Sangdi
f25b67faf4 rgw: add a new error message for user conflict when using Admin Ops API 
Add a new error message to indicate user conflict, which was using the error code for bucket conflict.

Signed-off-by: Sangdi Xu <xu.sangdi@h3c.com>
 2015-09-18 11:18:52 +08:00
Sage Weil
fd5ed1531d Merge pull request #5948 from flyd1005/master 
doc: delete wrong description of installing RPMs
 2015-09-17 22:14:56 -04:00
Samuel Just
490938e3a9 osd/: find_object_context: return obc for head for snapdir if non null 
The head obc may have an in progress operation holding a lock, we
need to block on the lock for ordering reasons.

Fixes: #13143
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-09-17 16:53:07 -07:00
Sage Weil
c37311054d Merge pull request #5926 from dillaman/wip-13082 
include/inline_memory: out-of-bounds read on unaligned memory

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-17 15:09:17 -04:00
Yan, Zheng
bdb2fa241b mds: Make sure wanted_state of first MDSBeacon is MDSMap::STATE_BOOT 
Fixes: #12506
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-09-18 00:50:53 +08:00
Sage Weil
85bece775c new release key 
The previous release key,

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

may have been compromised.

The new release key is

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-09-17 12:28:25 -04:00
Kefu Chai
c029c4343c Merge pull request #5947 from weiqian/master 
doc: replaces 'osd host' with 'host' in ceph.conf docs.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-17 23:44:57 +08:00
Yan, Zheng
943558c952 Merge pull request #5964 from jcsp/wip-13138 
libcephfs: fix calling init() then mount()
 2015-09-17 20:55:34 +08:00
John Spray
6a24d3198a libcephfs: fix calling init() then mount() 
Previously only ever called these separately, but
it should be allowed for callers to use one after
the other.

Fixes: #13138
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-09-17 13:47:58 +01:00
Orit Wasserman
3b60856545 Merge pull request #5963 from jcsp/wip-cmake-cephfs 
CMake: fix libcephfs shared lib generation
 2015-09-17 12:59:43 +02:00
Kefu Chai
b8dc21e8b6 Merge pull request #5857 from ceph/wip-da-SCA-20150812 
SCA and compiler warning fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-17 18:54:24 +08:00
Kefu Chai
6e8e0e7bb5 Merge pull request #5870 from s09816/master 
osd:the fuction osd::shutdown Lock failed.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-17 18:52:54 +08:00
Kefu Chai
47afe9aed2 Merge pull request #5096 from tchaikov/wip-add-bl-const-iterator 
common/buffer: add bufferlist::const_iterator

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-17 18:51:36 +08:00
John Spray
e017aab23c CMake: fix libcephfs shared lib generation 
Previously weren't generating versioned symlinks
etc, so python bindings didn't find it.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-09-17 11:27:26 +01:00
Kefu Chai
3045168f0a Merge pull request #5920 from caibo2014/fix-tool-bug 
tools: ceph_monstore_tool: remove the output file when get map fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-17 17:09:18 +08:00
Kefu Chai
11e9c0667e Merge pull request #5960 from dachary/wip-13136-python3-coverage 
install-deps.sh: disable python3

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-17 16:59:00 +08:00
Loic Dachary
7182499ca3 install-deps.sh: disable python3 
Disable python3 support until
https://bugs.launchpad.net/ubuntu/+source/python-coverage/+bug/1496715
is fixed.

Nothing in the build process depends on python3 right now, there is no
harm disabling it.

http://tracker.ceph.com/issues/13136 Fixes: #13136

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-09-17 09:35:11 +02:00
Jianpeng Ma
a825f6864d client/MetaRequest: optimize func can_forward/auth_is_best. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-17 11:14:31 +08:00
xinxin shu
a1959284f1 unify order limit 
Fixes: #13124

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
 2015-09-17 11:07:58 +08:00
Jianpeng Ma
f51afa63b1 client/MetaRequest: open w/ O_CREAT|O_TRUNC is write. 
From the function name is_write, it judge MetaRequest whether write.
For open, if it w/ O_CREAT|O_TRUNC, it's a write op and vice versa.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-17 10:05:46 +08:00
Jianpeng Ma
8f46bd9c78 clinet/MetaRequest: Remove the useless condition. 
"head.op & CEPH_MDS_OP_WRITE" include "head.op == CEPH_MDS_OP_CREATE".
So remove the conditon statement "head.op == CEPH_MDS_OP_CREATE".

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-17 09:57:04 +08:00
Kefu Chai
d0ac68bf17 mon/PGMap: calc min_last_epoch_clean when decode 
Fixes: #13112
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-09-16 22:04:32 +08:00
Sage Weil
391cfb9f48 Merge pull request #5841 from ceph/wip-12994-rbd-replay-packaging 
#12994: packaging: move rbd-replay* to ceph-common

Reviewed-by: James Page <jamespage@ubuntu.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2015-09-16 09:12:16 -04:00
Sage Weil
f389f6b8b9 Merge pull request #5946 from liewegas/wip-rgw-logdir 
radosgw: log to /var/log/ceph instead of /var/log/radosgw

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-09-16 09:11:33 -04:00
Li Peng
d1505b5408 doc: delete wrong description of installing RPMs 
In CentOS/RHEL 6/7, gitk and git-gui are available in default repository actually.

Signed-off-by: Li Peng <lip@dtdream.com>
 2015-09-16 14:05:05 +08:00
weiqian
1f7a2dc506 doc:Replaces 'osd host' with 'host' 
Signed-off-by: weiqian <weiq@dtdream.com>
 2015-09-16 11:04:52 +08:00
Sage Weil
c1b28591a2 radosgw: log to /var/log/ceph instead of /var/log/radosgw 
This is simpler.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-09-15 18:05:59 -04:00
Sage Weil
b615f35a04 Merge remote-tracking branch 'gh/infernalis' 2015-09-15 17:42:42 -04:00
Sage Weil
07893665a1 Merge pull request #5725 from liewegas/wip-scrub-stats 
osd/ReplicatedPG: snaptimmer: adjust stats through ctx->delta_stats

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-09-15 17:36:47 -04:00