Commit Graph

46245 Commits

Author SHA1 Message Date
Accela Zhao
117e63041a Correct typo 'restared' to 'restarted'
There is a typo in document "Monitoring OSDs and PGs" as below

    An OSD was ``down``, was restared, and is now ``recovering``.

This patch corrects 'restared' to 'restarted'. The whole code base
is also searched to ensure there is no more 'restared'.

Signed-off-by: Yilong Zhao <accelazh@gmail.com>
2015-11-30 22:24:26 +08:00
Loic Dachary
99d180478f Merge pull request #6733 from tchaikov/wip-fixcodingstyle
CodingStyle: fix broken URLs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-30 15:00:04 +01:00
Kefu Chai
691199bd37 CodingStyle: fix broken URLs
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-11-30 21:12:37 +08:00
Loic Dachary
2af7c9f719 Merge pull request #6724 from dachary/wip-13592-test-auto-repair
tests: fix race condition testing auto scrub

Reviewed-by: Xinze Chi <xinze@xsky.com>
2015-11-29 17:01:14 +01:00
Loic Dachary
f79e28902f tests: fix race condition testing auto scrub
When testing auto scrub, waiting 20 seconds for the scrub to complete is
sometimes not enough and creates false negatives.

Split wait_for_scrub out of the repair helper so that it can be used to
wait for the scrub to happen instead of using a timer.

The scrub timestamp is obtained after removing the object, therefore
there is a chance for the scrub to be finished already. But since auto
scrub is scheduled every 5 seconds, it will only make the test wait an
extra 5 seconds and not hang forever.

http://tracker.ceph.com/issues/13592

Signed-off-by: Xinze Chi <xinze@xsky.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-11-29 12:17:16 +01:00
Sage Weil
dc217d433f Merge pull request #6503 from XinzeChi/wip-repop-worker
osd: defer decoding of MOSDRepOp/MOSDRepOpReply

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-28 08:31:12 -05:00
Sage Weil
2a9d6cbcb7 Merge pull request #6597 from ceph/wip-fix-kvdb-test
tests: ceph_test_keyvaluedb_iterators: fix broken test

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-11-28 08:29:15 -05:00
Sage Weil
7b90b50a2a Merge pull request #6543 from efirs/optimize-stringify-call
common: reduce CPU usage by making stringstream in stringify function thread local

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-28 08:28:36 -05:00
Sage Weil
daf087844b Merge pull request #6455 from 0003ydlom/perfctrwa
osd: enable perfcounters on sharded work queue mutexes

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-28 08:27:40 -05:00
Sage Weil
dc9bbbf4e9 Merge pull request #6441 from aclamk/wip-faster-log-fixed
common: optimize debug logging code

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-28 08:26:53 -05:00
Sage Weil
a12efa204e Merge pull request #6276 from david-z/wip-systemd-finegrain-ceph-service
systemd: start/stop/restart ceph services by daemon type

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Sage Weil  <sage@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-11-28 08:25:40 -05:00
Sage Weil
c72bb31d61 Merge pull request #6198 from XinzeChi/wip-buffer-history-alloc
common: perf counter for bufferlist history total alloc

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-28 08:23:40 -05:00
Sage Weil
d704c54b79 Merge pull request #6081 from trociny/wip-pool_opts_t
osd: pg_pool_t: add dictionary for pool options

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-27 10:34:33 -05:00
Mykola Golub
e6dcf1419a osd: store per pool scrub intervals in pool options
ceph osd pool set $POOL scrub_min_interval N
  ceph osd pool set $POOL scrub_max_interval N
  ceph osd pool set $POOL deep_scrub_interval N

If N > 0, this value is used for the pool instead of
the corresponding global parameter from the config
(osd_scrub_min_interval, osd_scrub_max_interval or
osd_deep_scrub_interval).

Fixes: #13077
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-27 13:35:51 +02:00
Mykola Golub
2b252d294d tests: workunits should not have ./ (assume it in $PATH)
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-27 12:17:17 +02:00
Mykola Golub
73077dd0b5 osd: pg_pool_t: add dictionary for pool options
It is going to be used to store per pool configuration parameters like
scrub intervals or recovery priority.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-27 12:17:16 +02:00
Kefu Chai
4189380f1f Merge pull request #6710 from jdurgin/wip-13877
test: use sequential journal_tid for object cacher test

Reported-by: Kefu Chai <kchai@redhat.com>
2015-11-27 16:48:56 +08:00
Kefu Chai
9ab820f825 Merge pull request #6711 from jdurgin/wip-13880
pybind: decode empty string in conf_parse_argv() correctly

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-27 14:14:50 +08:00
Sage Weil
4b80b30079 Merge pull request #6653 from branch-predictor/bp-no-zero-reverse
common: don't reverse hobject_t hash bits when zero

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:30:38 -05:00
Sage Weil
2c46004571 Merge pull request #6475 from branch-predictor/bp-trim-n-reorder-bools
osd: reduce memory consumption of some structs

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:29:58 -05:00
Sage Weil
6ddaf3570b Merge pull request #6456 from stiopaa1/removeConstr
common: buffer: remove unneeded list destructor

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:29:31 -05:00
Sage Weil
4d52382dd8 Merge pull request #6263 from dx9/wip-12406-os-filestore
osd: FileStore: remove __SWORD_TYPE dependency

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:28:51 -05:00
Sage Weil
ca9f9d1747 Merge pull request #6262 from dx9/wip-12406-os-fs
osd: remove __SWORD_TYPE dependency

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:28:31 -05:00
Sage Weil
489b2a3594 Merge pull request #6175 from XinzeChi/wip-finisher-lat
common: add latency perf counter for finisher

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:28:10 -05:00
Sage Weil
d8cfce25e8 Merge pull request #6102 from mslovy/wip-mon-leak-fix
mon: fix routed_request_tids leak

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:27:47 -05:00
Sage Weil
1d46a65c1d Merge pull request #6093 from tchaikov/wip-kvstore-tool-argv
ceph-kvstore-tool: handle bad out file on command line

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:26:43 -05:00
Sage Weil
b7eb167861 Merge pull request #5793 from yuyuyu101/impl-perf
osd: add osd op queue latency perfcounter

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-26 17:26:05 -05:00
Sage Weil
d633b64566 Merge pull request #5734 from cxwshawn/mon-fix
auth: make keyring without mon entity type return -EACCES

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-26 17:24:59 -05:00
Loic Dachary
c4fff6f73c Merge pull request #6714 from aiicore/test_encoding_readable
test/encoding/readable.sh fix

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-26 15:12:57 +01:00
Igor Podoski
8a9db3734e test/encoding/readable.sh fix
1. Fix formatting (mixed tabs and spaces)
2. Status of skipped types was showing always last version in directory

Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
2015-11-26 13:38:50 +01:00
Loic Dachary
8870a4ae9c Merge pull request #6705 from vanpire110/master
doc: Fixes a spelling error

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-26 10:15:25 +01:00
Josh Durgin
f76d5d6fe6 pybind: decode empty string in conf_parse_argv() correctly
cretargs is a array of c_char_p, which means ctypes has already
converted it to python byte strings. decode_cstr() would misinterpret
the empty string as a NULL c_char_p(), and convert it to None by
accident, resulting in errors when running commands like
'ceph config-key put foo ""'.

Since this is the only place we use arrays of c_char_p, just decode
it directly in conf_parse_argv(). Tested with python 2 and 3.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-11-25 21:42:01 -08:00
Kefu Chai
1bf023920d Merge pull request #6699 from dachary/wip-ceph-helpers
tests: ceph-helpers assert success getting backfills

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-26 12:38:48 +08:00
Josh Durgin
9331e031bd test: use sequential journal_tid for object cacher test
This matches the real usage by librbd.

Fixes: #13877
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-11-25 20:24:30 -08:00
Jeremy Qian
573151f35f doc: Fixes a spelling error
Signed-off-by: Jeremy Qian <vanpire110@163.com>
2015-11-26 09:44:06 +08:00
Sage Weil
891e985f73 Merge pull request #6533 from ghost/wip-fix-trivial-bug
osd: fix trivial scrub bug

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-25 20:15:13 -05:00
Sage Weil
7f34d55935 Merge pull request #6612 from H3C/wip-yrf-destroy_collection
osd: fix FileStore::_destroy_collection error return code

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2015-11-25 20:14:45 -05:00
Sage Weil
55487eeb03 Merge pull request #6660 from chengyli/master
mon: fix ceph df pool available calculation for 0-weighted OSDs

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-25 20:13:40 -05:00
Sage Weil
88fe166cfa Merge pull request #6473 from H3C/wip-osd-bugfix1
auth: fail if rotating key is missing (do not spam log)

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-25 17:46:01 -05:00
Sage Weil
d9705f49ef Merge pull request #6278 from XinzeChi/wip-failinfo-mon
osd: cancel failure reports if we fail to rebind network

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-25 17:44:56 -05:00
Sage Weil
058733bb4b Merge pull request #6675 from rohanmars/wip-aix-librados-port
aix gcc librados port

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-25 17:43:44 -05:00
Rohan Mars
b96c7e6383 aix shared library build
Signed-off-by: Rohan Mars <code@rohanmars.com>
2015-11-25 18:30:31 -05:00
Greg Farnum
5090744560 Merge branch 'wip-13800' of git://github.com/ukernel/ceph
client: fix deadlock related to async pagecache invalidation

Conflicts:
	src/client/Client.cc
Fixed a conflict with the earlier page cache invalidate
changes in 73beb7f937.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 14:21:38 -08:00
Gregory Farnum
37dd1f00e2 Merge pull request #6454 from H3C/wip-mds
mds: repair the command option "--hot-standby"

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:10:58 -05:00
Gregory Farnum
3fed378f8b Merge pull request #6269 from jcsp/wip-client-mark-down
client: close mds sessions in shutdown()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:07:56 -05:00
Gregory Farnum
7d1291413b Merge pull request #6380 from ukernel/wip-client-keep-cache
client: don't invalidate page cache when inode is no longer used

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:02:06 -05:00
Gregory Farnum
e3e0846462 Merge pull request #6253 from jcsp/wip-client-availability
client: a better check for MDS availability

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:00:04 -05:00
Yehuda Sadeh
7ce223ec0f Merge pull request #6051 from clever215/master
rgw: add an inspection to the field of type when assigning user caps

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-25 09:37:40 -08:00
clever215
13a12a5364 rgw: add an inspection to the field of type when assigning user caps
Bug #13096

This modification adds the check to the field of type of a user's capality while previous versions set it any value. i.e. we limit the option of types to the 9 certain values, which are "users|buckets|metadata|usage|zone|bilog|mdlog|datalog|ops These 9 choosens are found in ceph documents and in source codes.

Signed-off-by: Kongming Wu <wu.kongming@h3c.com>
2015-11-25 11:33:09 -05:00
Josh Durgin
12d3d64496 Merge pull request #6700 from dillaman/wip-librbd-32bit-support
librbd: simplify IO method signatures for 32bit environments

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-25 08:24:37 -08:00