Commit Graph

43553 Commits

Author SHA1 Message Date
Sage Weil
623a8e7ce9 test/encoding/check-generated: test sorted json dumps for nondeterministic objects
Nondeterministic objects dump nondeterministically (usually due
to unordered_map or _set).  Compare their sorted output.  This
is a weaker test but is better than nothing.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-13 14:49:40 -04:00
Sage Weil
23119ffacc Revert "osd/HitSet: make subclasses dump deterministically"
This reverts commit 34c048b3cb.
2015-08-13 14:37:32 -04:00
Sage Weil
c8bb8a2abb Revert "mon/PGMap: dump osd_epochs in deterministic order"
This reverts commit 3df6438cd2.
2015-08-13 14:37:16 -04:00
Sage Weil
46c422f80c Merge pull request #4864 from stevecapperlinaro/for-ceph/journal-page-size-fix
FileJournal: Remove CEPH_PAGE_SIZE assumptions

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-13 11:35:12 -04:00
Sage Weil
9558d59489 Merge pull request #5100 from stevecapperlinaro/for-ceph/tweak-buffer-append-size
Common: Do not use CEPH_PAGE_SIZE when appending buffers in Ceph

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-13 11:34:56 -04:00
Sage Weil
6cb8bc7f44 Merge pull request #5339 from xinxinsh/wip-use-throttle
use throttle framework to throttle objectstore ops/bytes

Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-13 11:34:13 -04:00
Yan, Zheng
4d4fe9dbc0 crypto: fix unbalanced ceph::crypto::init/ceph::crypto:shutdown
we may create a CephContext without calling common_init_finish(), then
delete the CephContext. In this case, ceph::crypto:init() is not called,
so CephContext::~CephContext() should not call ceph::crypto::shutdown().

Fixes: #12598
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2015-08-13 10:46:03 -04:00
Sage Weil
6c6d62fa72 Merge pull request #5573 from SUSE/wip-restart-on-rpm-removal-only
ceph.spec.in: test %preun argument is zero for removal-only operations
2015-08-13 10:21:37 -04:00
Nathan Cutler
6c803cdf42 ceph.spec.in: test %preun argument is zero for removal-only operations
The %preun section now contains logic for disabling and stopping all the
Ceph systemd units when the ceph package is removed. However, there is no
conditional around it, so the units are disabled and stopped on RPM upgrade
as well as removal.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
2015-08-13 15:36:02 +02:00
Sage Weil
bf0a614fa3 Merge pull request #5562 from varadakari/wip-kvstore-statfs
Adding statfs api to KeyValueDB

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-13 08:51:01 -04:00
Sage Weil
930927bccd Merge pull request #5565 from varadakari/wip-kvstore-makefile
Remove redundant line from Makefile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-13 08:44:42 -04:00
Loic Dachary
5f41e8d25c tests: do not test timeout mon add
Strictly speaking it's not a feature, but an expected hahaviour. After
discussion it does not seem useful to have that test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-08-13 14:14:02 +02:00
John Spray
f2a38bfa89 client: fix unused var warning
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-13 11:18:20 +01:00
John Spray
593fcc1af8 Merge remote-tracking branch 'origin/next' 2015-08-13 11:00:50 +01:00
John Spray
ad8aaae831 Merge pull request #5564 from wonzhq/test-inode
mds: initialize 'divergent' to false when comparing inode_t

Reviewed-by: John Spray <john.spray@redhat.com>
2015-08-13 10:43:53 +01:00
John Spray
ca7780eb75 Merge pull request #5553 from majianpeng/mds
mds (fix to flags_to_mode and cleanup in handle_client_open)

Reviewed-by: John Spray <john.spray@redhat.com>
2015-08-13 10:36:40 +01:00
Jianpeng Ma
408ada4edf mds/Server: clean up code for handle_client_open.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-08-13 17:04:03 +08:00
Jianpeng Ma
43529a5883 common/ceph_fs: set mode default is -1 for func ceph_flags_to_mode.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-08-13 17:03:52 +08:00
Varada Kari
6eea794129 Remove redundant line from Makefile
Signed-off-by: Varada Kari <varada.kari@sandisk.com>
2015-08-13 12:23:45 +05:30
Zhiqiang Wang
e1ff09ce63 mds: initialize 'divergent' to false when comparing inode_t
'divergent' is not set in the case when all the fields of 'inode_t' are
equal.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-13 14:28:50 +08:00
Varada Kari
d33ad154bf Adding statfs api to KeyValueDB
If any backend supports and implements statfs will extract the
stats from backend to show correct utilization in the status.

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
2015-08-13 11:05:50 +05:30
root
7add646841 rbd:Check the dest image name, if it is empty string, refuse to execute and give a message
Signed-off-by: solesoul1127 <chen.yehua@h3c.com>
2015-08-12 23:18:56 -04:00
Josh Durgin
6a1dbf30cf Merge pull request #5544 from ceph/wip-12664-next
librbd: prevent race condition between resize requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-12 16:22:46 -07:00
Loic Dachary
b78883b188 tests: be more generous with mon tests timeouts
Change the timeouts of the TEST_mon_add_to_single_mon tests to be 120
seconds. They have value to guard against blocking forever. The exact
timing does not matter as long as the operation completes.

When a timeout is too short, it will create false negatives when running
on slow machines. It could be argued that being too generous with
timeout in general may hide problems. But not in this specific case.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-08-12 16:59:29 +02:00
Kefu Chai
d8d6bb898d Merge pull request #5550 from schuzhoy/schuzhoy-patch-1
doc: Correcting the default number of copies.

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-12 17:25:18 +08:00
Kefu Chai
62d3f459ea Merge pull request #5072 from zhouyuan/doc_rgw_rados_handlers
doc: update rgw configuration on multiple rgw rados handlers feature

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-12 17:21:38 +08:00
Loic Dachary
fe28e19b5d Merge pull request #5495 from tchaikov/wip-12620
doc/rados/operations/add-or-rm-mons: simplify the steps to add a mon

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-12 09:49:18 +02:00
Yan, Zheng
606e858af3 Merge pull request #5528 from Be-El/master
Correct handling of supplementary groups in ceph-fuse (Bug 12617)
2015-08-12 11:30:00 +08:00
Yuan Zhou
7e6f819009 doc: update rgw configuration on multiple rgw rados handlers feature
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-08-12 09:09:07 +08:00
Alexander Chuzhoy
efc8969ec3 Doc: Correcting the default number of copies.
According to the "quick ceph deploy" page, the default number of replicas in the Ceph configuration file is 3

Signed-off-by: Sasha Chuzhoy <sashac88@hotmail.com>
2015-08-11 18:40:00 -04:00
Yehuda Sadeh
79e776865e Merge pull request #5047 from rzarzynski/wip-12108
rgw: rework X-Trans-Id header to be conform with Swift API.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-11 14:01:46 -07:00
Yehuda Sadeh
0328bc6831 Merge pull request #5449 from yangruifeng/wip-rgw-bugfix1
rgw:segmentation fault when rgw_gc_max_objs > HASH_PRIME

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-11 11:39:42 -07:00
Yehuda Sadeh
7b5f9b05be Merge pull request #5447 from yangruifeng/master
rgw:the arguments 'domain' should not be assigned when return false

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-11 11:32:39 -07:00
John Spray
28a0a9af11 Merge pull request #5543 from ceph/wip-cmake-nlist
CMake: add missing librados nlist test

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-11 19:19:42 +01:00
John Wilkins
9b8c518ba6 Merge pull request #5547 from ritz303/wip-doc-11082
doc: Removed reference to RAID-4

Reviewed-by: John Wilkins <jowilkin@redhat.com>
2015-08-11 10:48:23 -07:00
ritz303
6f768a7cff doc: Removed reference to RAID-4
Fixes: #11082

Signed-off-by: ritz303 <ritz_303@yahoo.com>
2015-08-11 12:46:10 -05:00
John Wilkins
f3330a18f5 Merge pull request #5546 from ritz303/wip-doc-11897
doc: Clarify how 'ceph auth caps' works.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
2015-08-11 10:11:12 -07:00
John Spray
c6cf558c1f CMake: cut down unnecessary linkage on rados tests
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-11 16:35:18 +01:00
John Spray
6ee955d14d CMake: add missing librados nlist test
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-11 16:00:51 +01:00
John Spray
db55527e6c Merge pull request #5354 from ceph/wip-pgls-filter-librados
librados: partially expose PGLS filter interface

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-08-11 15:40:58 +01:00
Kefu Chai
b199ac6c41 doc/rados/operations/add-or-rm-mons: simplify the steps to add a mon
this change removes the step to "ceph mon add" before starting a new
monitor. because the existing leader will start an election at seeing
the MMonJoin message sent by the new joiner, after the quorum is
archieved, the monmap will be updated with the new monitor.
so, "ceph mon add" is not necessary to add a new monitor.
moreover, this command will be blocked until a new quorum is formed,
and the proposed monmap is accepted. but in case of adding a monitor
to a single monitor cluster, the leader will wait until at least two
of the monitors reply to it. apparently, this does not happen unless
the new monitor starts. so from the user's point of view, this
command hangs until timesout, if he/she does not start the mon.b
beforehand. but this is an expected behaviour.

so, to avoid this confusion and simplify the steps to add a new
monitor. we'd better simply remove this "ceph mon add" step.

Fixes: #12620
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-11 22:18:04 +08:00
Jason Dillaman
6ec431bac1 librbd: prevent race condition between resize requests
It was possible that the same resize request could be sent twice
if a completed resize op started a newly created resize op while
it was also being concurrently started by another thread.

Fixes: #12664
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-08-11 09:26:33 -04:00
Sage Weil
2146443581 Merge pull request #5535 from ceph/wip-gentest
mon: Improve PGMap::generate_test_instances(), build map per incremental

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-11 08:52:59 -04:00
Kefu Chai
55b349043d Merge pull request #5457 from ceph/wip-cmake-vstart
Make vstart work with cmake out of tree builds

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-11 20:49:15 +08:00
blinke
af18d4799a Merge remote-tracking branch 'upstream/master' 2015-08-11 13:41:44 +02:00
John Spray
e8a53d2305 test: add case for pgls filter arg in librados
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-11 11:17:18 +01:00
John Spray
4649ba506c librados: partially expose PGLS filter interface
Not bothering with this for non-namespaced object iterator
or the C interface.  Expect to replace this with
the new-style pgls, so just exposing it enough for
cephfs-data-scan to touch the new osd-side pgls filtering
on forward scrub tags.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-11 11:17:18 +01:00
Haomai Wang
a6ba518fc3 Merge pull request #5542 from l11625/master
The listen_sd of thread also can be zero when we call the processor::start function..

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-11 16:57:08 +08:00
Kefu Chai
7ffcfdb6e7 Merge pull request #5533 from ceph/wip-fix-mon-join.joao
mon: Monitor: set MMonJoin's op type as service

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-11 16:26:41 +08:00
l11625
cabfd5c44b when the processor start ,listen_sd also can be zero. 2015-08-11 16:12:45 +08:00