]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agomon: MonmapMonitor: don't expose uncommitted state to client 6854/head
Joao Eduardo Luis [Thu, 3 Dec 2015 15:05:08 +0000 (15:05 +0000)]
mon: MonmapMonitor: don't expose uncommitted state to client

During prepare_command(), we were returning to the user based on
pending_map's state. Even though this weren't causing any issues we are
aware of, we really shouldn't do that.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #6724 from dachary/wip-13592-test-auto-repair 6728/head
Loic Dachary [Sun, 29 Nov 2015 16:01:14 +0000 (17:01 +0100)]
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>
9 years agotests: fix race condition testing auto scrub 6724/head
Loic Dachary [Sat, 28 Nov 2015 16:55:46 +0000 (17:55 +0100)]
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>
9 years agoMerge pull request #6503 from XinzeChi/wip-repop-worker
Sage Weil [Sat, 28 Nov 2015 13:31:12 +0000 (08:31 -0500)]
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>
9 years agoMerge pull request #6597 from ceph/wip-fix-kvdb-test
Sage Weil [Sat, 28 Nov 2015 13:29:15 +0000 (08:29 -0500)]
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>
9 years agoMerge pull request #6543 from efirs/optimize-stringify-call
Sage Weil [Sat, 28 Nov 2015 13:28:36 +0000 (08:28 -0500)]
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>
9 years agoMerge pull request #6455 from 0003ydlom/perfctrwa
Sage Weil [Sat, 28 Nov 2015 13:27:40 +0000 (08:27 -0500)]
Merge pull request #6455 from 0003ydlom/perfctrwa

osd: enable perfcounters on sharded work queue mutexes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6441 from aclamk/wip-faster-log-fixed
Sage Weil [Sat, 28 Nov 2015 13:26:53 +0000 (08:26 -0500)]
Merge pull request #6441 from aclamk/wip-faster-log-fixed

common: optimize debug logging code

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6276 from david-z/wip-systemd-finegrain-ceph-service
Sage Weil [Sat, 28 Nov 2015 13:25:40 +0000 (08:25 -0500)]
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>
9 years agoMerge pull request #6198 from XinzeChi/wip-buffer-history-alloc
Sage Weil [Sat, 28 Nov 2015 13:23:40 +0000 (08:23 -0500)]
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>
9 years agoMerge pull request #6081 from trociny/wip-pool_opts_t
Sage Weil [Fri, 27 Nov 2015 15:34:33 +0000 (10:34 -0500)]
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>
9 years agoosd: store per pool scrub intervals in pool options 6081/head
Mykola Golub [Tue, 29 Sep 2015 06:35:32 +0000 (09:35 +0300)]
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>
9 years agotests: workunits should not have ./ (assume it in $PATH)
Mykola Golub [Fri, 27 Nov 2015 06:23:55 +0000 (08:23 +0200)]
tests: workunits should not have ./ (assume it in $PATH)

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoosd: pg_pool_t: add dictionary for pool options
Mykola Golub [Tue, 29 Sep 2015 06:24:24 +0000 (09:24 +0300)]
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>
9 years agoMerge pull request #6710 from jdurgin/wip-13877
Kefu Chai [Fri, 27 Nov 2015 08:48:56 +0000 (16:48 +0800)]
Merge pull request #6710 from jdurgin/wip-13877

test: use sequential journal_tid for object cacher test

Reported-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6711 from jdurgin/wip-13880
Kefu Chai [Fri, 27 Nov 2015 06:14:50 +0000 (14:14 +0800)]
Merge pull request #6711 from jdurgin/wip-13880

pybind: decode empty string in conf_parse_argv() correctly

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6653 from branch-predictor/bp-no-zero-reverse
Sage Weil [Thu, 26 Nov 2015 22:30:38 +0000 (17:30 -0500)]
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>
9 years agoMerge pull request #6475 from branch-predictor/bp-trim-n-reorder-bools
Sage Weil [Thu, 26 Nov 2015 22:29:58 +0000 (17:29 -0500)]
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>
9 years agoMerge pull request #6456 from stiopaa1/removeConstr
Sage Weil [Thu, 26 Nov 2015 22:29:31 +0000 (17:29 -0500)]
Merge pull request #6456 from stiopaa1/removeConstr

common: buffer: remove unneeded list destructor

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6263 from dx9/wip-12406-os-filestore
Sage Weil [Thu, 26 Nov 2015 22:28:51 +0000 (17:28 -0500)]
Merge pull request #6263 from dx9/wip-12406-os-filestore

osd: FileStore: remove __SWORD_TYPE dependency

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6262 from dx9/wip-12406-os-fs
Sage Weil [Thu, 26 Nov 2015 22:28:31 +0000 (17:28 -0500)]
Merge pull request #6262 from dx9/wip-12406-os-fs

osd: remove __SWORD_TYPE dependency

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6175 from XinzeChi/wip-finisher-lat
Sage Weil [Thu, 26 Nov 2015 22:28:10 +0000 (17:28 -0500)]
Merge pull request #6175 from XinzeChi/wip-finisher-lat

common: add latency perf counter for finisher

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6102 from mslovy/wip-mon-leak-fix
Sage Weil [Thu, 26 Nov 2015 22:27:47 +0000 (17:27 -0500)]
Merge pull request #6102 from mslovy/wip-mon-leak-fix

mon: fix routed_request_tids leak

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6093 from tchaikov/wip-kvstore-tool-argv
Sage Weil [Thu, 26 Nov 2015 22:26:43 +0000 (17:26 -0500)]
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>
9 years agoMerge pull request #5793 from yuyuyu101/impl-perf
Sage Weil [Thu, 26 Nov 2015 22:26:05 +0000 (17:26 -0500)]
Merge pull request #5793 from yuyuyu101/impl-perf

osd: add osd op queue latency perfcounter

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5734 from cxwshawn/mon-fix
Sage Weil [Thu, 26 Nov 2015 22:24:59 +0000 (17:24 -0500)]
Merge pull request #5734 from cxwshawn/mon-fix

auth: make keyring without mon entity type return -EACCES

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6714 from aiicore/test_encoding_readable
Loic Dachary [Thu, 26 Nov 2015 14:12:57 +0000 (15:12 +0100)]
Merge pull request #6714 from aiicore/test_encoding_readable

test/encoding/readable.sh fix

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest/encoding/readable.sh fix 6714/head
Igor Podoski [Thu, 26 Nov 2015 12:38:50 +0000 (13:38 +0100)]
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>
9 years agoMerge pull request #6705 from vanpire110/master
Loic Dachary [Thu, 26 Nov 2015 09:15:25 +0000 (10:15 +0100)]
Merge pull request #6705 from vanpire110/master

doc: Fixes a spelling error

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agopybind: decode empty string in conf_parse_argv() correctly 6711/head
Josh Durgin [Thu, 26 Nov 2015 05:37:23 +0000 (21:37 -0800)]
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>
9 years agoMerge pull request #6699 from dachary/wip-ceph-helpers
Kefu Chai [Thu, 26 Nov 2015 04:38:48 +0000 (12:38 +0800)]
Merge pull request #6699 from dachary/wip-ceph-helpers

tests: ceph-helpers assert success getting backfills

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest: use sequential journal_tid for object cacher test 6710/head
Josh Durgin [Thu, 26 Nov 2015 04:24:30 +0000 (20:24 -0800)]
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>
9 years agodoc: Fixes a spelling error 6705/head
Jeremy Qian [Thu, 26 Nov 2015 01:43:10 +0000 (09:43 +0800)]
doc: Fixes a spelling error

Signed-off-by: Jeremy Qian <vanpire110@163.com>
9 years agoMerge pull request #6533 from ghost/wip-fix-trivial-bug
Sage Weil [Thu, 26 Nov 2015 01:15:13 +0000 (20:15 -0500)]
Merge pull request #6533 from ghost/wip-fix-trivial-bug

osd: fix trivial scrub bug

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6612 from H3C/wip-yrf-destroy_collection
Sage Weil [Thu, 26 Nov 2015 01:14:45 +0000 (20:14 -0500)]
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>
9 years agoMerge pull request #6660 from chengyli/master
Sage Weil [Thu, 26 Nov 2015 01:13:40 +0000 (20:13 -0500)]
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>
9 years agoMerge pull request #6473 from H3C/wip-osd-bugfix1
Sage Weil [Wed, 25 Nov 2015 22:46:01 +0000 (17:46 -0500)]
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>
9 years agoMerge pull request #6278 from XinzeChi/wip-failinfo-mon
Sage Weil [Wed, 25 Nov 2015 22:44:56 +0000 (17:44 -0500)]
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>
9 years agoMerge pull request #6675 from rohanmars/wip-aix-librados-port
Sage Weil [Wed, 25 Nov 2015 22:43:44 +0000 (17:43 -0500)]
Merge pull request #6675 from rohanmars/wip-aix-librados-port

aix gcc librados port

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoaix shared library build 6675/head
Rohan Mars [Wed, 25 Nov 2015 23:30:31 +0000 (18:30 -0500)]
aix shared library build

Signed-off-by: Rohan Mars <code@rohanmars.com>
9 years agoMerge branch 'wip-13800' of git://github.com/ukernel/ceph
Greg Farnum [Wed, 25 Nov 2015 22:21:38 +0000 (14:21 -0800)]
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 73beb7f9378182cc3901fe86c4f1f5d5d98169a6.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6454 from H3C/wip-mds
Gregory Farnum [Wed, 25 Nov 2015 22:10:58 +0000 (17:10 -0500)]
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>
9 years agoMerge pull request #6269 from jcsp/wip-client-mark-down
Gregory Farnum [Wed, 25 Nov 2015 22:07:56 +0000 (17:07 -0500)]
Merge pull request #6269 from jcsp/wip-client-mark-down

client: close mds sessions in shutdown()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6380 from ukernel/wip-client-keep-cache
Gregory Farnum [Wed, 25 Nov 2015 22:02:06 +0000 (17:02 -0500)]
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>
9 years agoMerge pull request #6253 from jcsp/wip-client-availability
Gregory Farnum [Wed, 25 Nov 2015 22:00:04 +0000 (17:00 -0500)]
Merge pull request #6253 from jcsp/wip-client-availability

client: a better check for MDS availability

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6051 from clever215/master
Yehuda Sadeh [Wed, 25 Nov 2015 17:37:40 +0000 (09:37 -0800)]
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>
9 years agorgw: add an inspection to the field of type when assigning user caps 6051/head
clever215 [Wed, 25 Nov 2015 16:31:48 +0000 (11:31 -0500)]
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>
9 years agoMerge pull request #6700 from dillaman/wip-librbd-32bit-support
Josh Durgin [Wed, 25 Nov 2015 16:24:37 +0000 (08:24 -0800)]
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>
9 years agolibrbd: simplify IO method signatures for 32bit environments 6700/head
Jason Dillaman [Wed, 25 Nov 2015 14:23:54 +0000 (09:23 -0500)]
librbd: simplify IO method signatures for 32bit environments

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoFix mon routed_request_tids leak 6102/head
Ning Yao [Thu, 8 Oct 2015 08:24:50 +0000 (16:24 +0800)]
Fix mon routed_request_tids leak

Signed-off-by: Ning Yao <zay11022@gmail.com>
9 years agotests: ceph-helpers assert success getting backfills 6699/head
Loic Dachary [Wed, 25 Nov 2015 11:17:14 +0000 (12:17 +0100)]
tests: ceph-helpers assert success getting backfills

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6625 from dillaman/wip-12698
Josh Durgin [Wed, 25 Nov 2015 03:01:14 +0000 (19:01 -0800)]
Merge pull request #6625 from dillaman/wip-12698

librbd: integrate journaling for maintenance operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6687 from dillaman/wip-journal-replay-fixes
Josh Durgin [Wed, 25 Nov 2015 00:37:52 +0000 (16:37 -0800)]
Merge pull request #6687 from dillaman/wip-journal-replay-fixes

journal: support replaying beyond skipped splay objects

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6685 from dachary/wip-erasure-code-benchmark
Loic Dachary [Tue, 24 Nov 2015 20:25:42 +0000 (21:25 +0100)]
Merge pull request #6685 from dachary/wip-erasure-code-benchmark

qa: erasure-code benchmark plugin selection

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
9 years agoMerge pull request #6292 from dx9/wip-12406-res_nquery
Yehuda Sadeh [Tue, 24 Nov 2015 20:09:10 +0000 (12:09 -0800)]
Merge pull request #6292 from dx9/wip-12406-res_nquery

rgw/rgw_resolve: fallback to res_query when res_nquery not implemented

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6236 from guangyy/err-msg
Sage Weil [Tue, 24 Nov 2015 20:00:07 +0000 (15:00 -0500)]
Merge pull request #6236 from guangyy/err-msg

osd: use pg id (without shard) when referring the PG

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6610 from ktdreyer/wip-build-doc-lxml
Sage Weil [Tue, 24 Nov 2015 17:49:08 +0000 (12:49 -0500)]
Merge pull request #6610 from ktdreyer/wip-build-doc-lxml

admin/build-doc: add lxml dependencies on debian

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoclient: s/close_sessions/_close_sessions/ 6269/head
John Spray [Tue, 24 Nov 2015 17:48:14 +0000 (17:48 +0000)]
client: s/close_sessions/_close_sessions/

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6323 from dingshang/wip-cephfs-dingshang
Gregory Farnum [Tue, 24 Nov 2015 15:16:47 +0000 (10:16 -0500)]
Merge pull request #6323 from dingshang/wip-cephfs-dingshang

pybind/cephfs: add symlink and its unit test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: close mds sessions in shutdown()
John Spray [Thu, 15 Oct 2015 00:31:16 +0000 (01:31 +0100)]
client: close mds sessions in shutdown()

Usually this happens in unmount(), but when we
have instantiated Client without mounting (to
send MDS commands), we need to handle closing
any open sessions in shutdown as well.

This is the correct replacement for the mark_down()
call that was removed from handle_command_reply
in the last commit.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge tag 'v10.0.0'
Sage Weil [Tue, 24 Nov 2015 13:41:04 +0000 (08:41 -0500)]
Merge tag 'v10.0.0'

v10.0.0

9 years agoMerge pull request #6684 from jcsp/wip-fix-scrub
Yan, Zheng [Tue, 24 Nov 2015 02:56:30 +0000 (10:56 +0800)]
Merge pull request #6684 from jcsp/wip-fix-scrub

mds: fix scrub_path

9 years agojournal: support replay passed skipped splay objects 6687/head
Jason Dillaman [Mon, 23 Nov 2015 22:46:55 +0000 (17:46 -0500)]
journal: support replay passed skipped splay objects

It's possible for a splay object within a set to be skipped
if the set is closed due to a full object within the set.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: verify that journal player can handle skipped journal objects
Jason Dillaman [Mon, 23 Nov 2015 19:35:43 +0000 (14:35 -0500)]
tests: verify that journal player can handle skipped journal objects

It's possible for a journal object to not exist if another journal object
within the same object set filled up before records were written.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6605 from yuyuyu101/wip-13797
Gregory Farnum [Mon, 23 Nov 2015 22:33:20 +0000 (17:33 -0500)]
Merge pull request #6605 from yuyuyu101/wip-13797

ceph_test_msgr: Use send_message instead of keepalive to wakeup connection

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6495 from objoo/master
Loic Dachary [Mon, 23 Nov 2015 22:31:06 +0000 (23:31 +0100)]
Merge pull request #6495 from objoo/master

Mailmap updates for infernalis.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agomailmap: Jenkins affiliation 6495/head
Yann Dupont [Sun, 8 Nov 2015 17:40:20 +0000 (18:40 +0100)]
mailmap: Jenkins affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agomailmap: Burkhard Linke affiliation
Yann Dupont [Sun, 8 Nov 2015 20:39:40 +0000 (21:39 +0100)]
mailmap: Burkhard Linke affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agomailmap: Chen Dihao affiliation
Yann Dupont [Sun, 8 Nov 2015 17:11:09 +0000 (18:11 +0100)]
mailmap: Chen Dihao affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agomailmap: Wei Qian affiliation
Yann Dupont [Sun, 8 Nov 2015 15:10:36 +0000 (16:10 +0100)]
mailmap: Wei Qian affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agoqa: erasure-code-benchmark technique and plugin selection 6685/head
Loic Dachary [Mon, 23 Nov 2015 19:59:28 +0000 (20:59 +0100)]
qa: erasure-code-benchmark technique and plugin selection

Update the PLUGINS variable that was no longer used. Add the TECHNIQUES
variable to control which techniques are compared.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoqa: erasure-code has --erasure-code-dir
Loic Dachary [Mon, 23 Nov 2015 19:21:42 +0000 (20:21 +0100)]
qa: erasure-code has --erasure-code-dir

It is used instead of the obsoleted --parameter directory= to specify
the location of the erasure code directory plugins.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoadd aix compile warning
Rohan Mars [Mon, 23 Nov 2015 18:09:24 +0000 (13:09 -0500)]
add aix compile warning

Signed-off-by: Rohan Mars <code@rohanmars.com>
9 years agoinitialized backtrace variables
Rohan Mars [Mon, 23 Nov 2015 17:47:02 +0000 (12:47 -0500)]
initialized backtrace variables

Signed-off-by: Rohan Mars <code@rohanmars.com>
9 years agomds: fix scrub_path 6684/head
John Spray [Mon, 23 Nov 2015 17:39:14 +0000 (17:39 +0000)]
mds: fix scrub_path

This was tripping up over calling
validate_disk_state with no ScrubHeader.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6679 from suckowbiz/patch-1
Loic Dachary [Mon, 23 Nov 2015 16:33:52 +0000 (17:33 +0100)]
Merge pull request #6679 from suckowbiz/patch-1

Fixed typos

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/release-notes: fix typo
Sage Weil [Mon, 23 Nov 2015 16:02:58 +0000 (11:02 -0500)]
doc/release-notes: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/release-notes: final v10.0.0 notes
Sage Weil [Mon, 23 Nov 2015 16:00:29 +0000 (11:00 -0500)]
doc/release-notes: final v10.0.0 notes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: do not ignore a failure report cancellation form osd 6278/head
Xinze Chi [Fri, 20 Nov 2015 12:59:35 +0000 (20:59 +0800)]
mon: do not ignore a failure report cancellation form osd

do not ignore a failure report cancellation form osd even if it is
down.

Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agomon: fix osd failure info in mon
Xinze Chi [Fri, 20 Nov 2015 12:59:16 +0000 (20:59 +0800)]
mon: fix osd failure info in mon

when the network adapter of node A run into error, osd in this node
would tell mon other osd's heartbeat is timeout also. So when rebind
fail after retry 3 times, the osd should cancel in-flight failure report
send to mon before.

Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agodoc: fix message typos in systemd 6679/head
suckowbiz [Mon, 23 Nov 2015 11:17:45 +0000 (12:17 +0100)]
doc: fix message typos in systemd

Signed-off-by: Tobias Suckow <tobias@suckow.biz>
9 years agoMerge branch 'master' of github.com:ceph/ceph
Sage Weil [Mon, 23 Nov 2015 14:01:30 +0000 (09:01 -0500)]
Merge branch 'master' of github.com:ceph/ceph

9 years agoMerge pull request #6666 from dachary/wip-release-notes
Sage Weil [Mon, 23 Nov 2015 14:01:48 +0000 (09:01 -0500)]
Merge pull request #6666 from dachary/wip-release-notes

release-notes: draft v10.0.0 release notes

9 years agoMerge branch 'wip-bigbang'
Sage Weil [Mon, 23 Nov 2015 13:39:46 +0000 (08:39 -0500)]
Merge branch 'wip-bigbang'

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest/mon/osd-crush.sh: escape ceph tell mon.*
Sage Weil [Fri, 20 Nov 2015 15:17:37 +0000 (10:17 -0500)]
test/mon/osd-crush.sh: escape ceph tell mon.*

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: make some of the pg_temp methods/fields private
Sage Weil [Mon, 16 Nov 2015 17:17:48 +0000 (12:17 -0500)]
osd: make some of the pg_temp methods/fields private

Reported-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: call notify completion only once
Sage Weil [Mon, 16 Nov 2015 16:32:34 +0000 (11:32 -0500)]
osdc/Objecter: call notify completion only once

If we race with a reconnect we could get a second notify message
before the notify linger op is torn down.  Ensure we only ever
call the notify completion once to prevent a segfault.

Fixes: #13805
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: change mon_osd_min_down_reporters from 1 -> 2
Sage Weil [Sat, 14 Nov 2015 03:34:12 +0000 (22:34 -0500)]
mon: change mon_osd_min_down_reporters from 1 -> 2

This makes more sense to me.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/OSDMonitor: simplify failure reporters vs reports logic
Sage Weil [Sat, 14 Nov 2015 03:27:14 +0000 (22:27 -0500)]
mon/OSDMonitor: simplify failure reporters vs reports logic

Since each OSD only sends a failure report for a given peer once,
we don't need to count reports vs reporters separately.  (This was
probably a bad idea anyway.)  Remove this logic and the associated
config option.

Reported-by: Greg Farnum <gfarnum@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: simplify pg creation
Sage Weil [Sat, 14 Nov 2015 03:11:17 +0000 (22:11 -0500)]
osd: simplify pg creation

We used to have a complicated pg creation process in which we
would query any previous mappings for the pg before we created the
new 'empty' pg locally.  The tracking of the prior mappings was
very simple (and broken), but it didn't really matter because the
mon would resend pg create messages periodically.  Now it doesn't,
so that broke.

However, none of this is necessary: the PG peering process does
all of the same things.  Namely, it

- enumerates past intervals
- determines which ones may have been rw
- queries OSDs from each one to gather any potential changes

This is a more robust version of what the creation code was (or
should have been doing).  So, let's rip it all out and let
peering handle it.  As long as the newly instantiated PG sets
last_epoch_started and _clean to the created epoch we will probe
and consider all of these prior mappings and find any previous
instance of the PG (if one existed).

Yay for removing unnecessary code!

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonClient: make _sub_got behave if we "got" old stuff
Sage Weil [Fri, 13 Nov 2015 18:03:16 +0000 (13:03 -0500)]
mon/MonClient: make _sub_got behave if we "got" old stuff

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/OSDMonitor: fix oldest_map in send_incremental
Sage Weil [Wed, 11 Nov 2015 03:19:48 +0000 (22:19 -0500)]
mon/OSDMonitor: fix oldest_map in send_incremental

This should be the oldest map on the sender (like every other
place that generates an MOSDMap message).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: avoid useless pg gets when pool is deleted
Sage Weil [Mon, 12 Oct 2015 02:06:33 +0000 (22:06 -0400)]
mon/PGMonitor: avoid useless pg gets when pool is deleted

If the .0 pg no longer exists, we know the entire pool was
deleted, and can avoid querying every other pg.  (This is a good
thing because leveldb and rocksdb can be very slow to query
missing keys.)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: revamp how pg creates are tracked
Sage Weil [Thu, 8 Oct 2015 16:13:40 +0000 (12:13 -0400)]
mon/PGMonitor: revamp how pg creates are tracked

Previously we were calculating and managing in-core state that
wasn't committed as part of the pg_map, leading to all sorts of
ugliness that didn't really work.  Instead,

 * set mapping in all creating pgs in the committed pg_map
 * make all pg create message sending be based on committed state
 * update mappings for creating pgs every time we consume a new
   osdmap, so that we have a reliable/stable epoch to attach to
   it.

In particular, having that stable epoch means we have a reference
we can put in the pg create message that will also be used for
the subscription version.  That way OSDs get consistent creates
from any mon.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: only send pg create messages to up osds
Sage Weil [Thu, 8 Oct 2015 16:12:34 +0000 (12:12 -0400)]
mon/PGMonitor: only send pg create messages to up osds

If the OSD is down it will ignore the message.  If it gets marked up, we
will eventually consume that map and call check_subs().

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: only churn mapping_epoch if the primary changes
Sage Weil [Wed, 7 Oct 2015 05:07:34 +0000 (01:07 -0400)]
mon/PGMonitor: only churn mapping_epoch if the primary changes

This results is fewer resent pg create messages.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: a bunch of cosmetic cleanup
Sage Weil [Fri, 9 Oct 2015 21:25:00 +0000 (17:25 -0400)]
mon/PGMonitor: a bunch of cosmetic cleanup

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: drop old creating_pgs_by_osd
Sage Weil [Wed, 7 Oct 2015 04:39:41 +0000 (00:39 -0400)]
mon/PGMonitor: drop old creating_pgs_by_osd

Obsoleted by creating_pgs_by_osd_epoch.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: reduce mon_subscribe messages
Sage Weil [Sat, 14 Nov 2015 17:57:05 +0000 (12:57 -0500)]
osd: reduce mon_subscribe messages

1. MonClient remembers our subscriptions; only indicate we want
osd_pg_creates once, in init.

2. We don't need to re-request the latest osdmap each time we
reconnect.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonClient: only send new subscriptions
Sage Weil [Wed, 7 Oct 2015 04:09:18 +0000 (00:09 -0400)]
mon/MonClient: only send new subscriptions

Instead of resending all subscriptions, only send the new ones.  This
avoids races like

 - ask for 4+
 - mon sends maps 4-50
 - ask for 4+ and something else
 - mon has to resend same maps and the other thing

Signed-off-by: Sage Weil <sage@redhat.com>