]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agovstart.sh: move rgw configuration to client.rgw section 18331/head
Yan Jun [Mon, 9 Oct 2017 03:41:12 +0000 (11:41 +0800)]
vstart.sh: move rgw configuration to client.rgw section

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
7 years agoMerge pull request #18122 from liewegas/wip-monthrash-peering
Sage Weil [Fri, 6 Oct 2017 20:32:45 +0000 (15:32 -0500)]
Merge pull request #18122 from liewegas/wip-monthrash-peering

qa/suites/rados/monthrash: tolerate PG_AVAILABILITY during mon thrashing

7 years agoMerge pull request #18047 from gregsfortytwo/wip-20416-bitwise-assert
Yuri Weinstein [Fri, 6 Oct 2017 19:48:35 +0000 (12:48 -0700)]
Merge pull request #18047 from gregsfortytwo/wip-20416-bitwise-assert

osd: make the PG's SORTBITWISE assert a more generous shutdown

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18049 from liewegas/wip-kv-iterator
Sage Weil [Fri, 6 Oct 2017 18:07:57 +0000 (13:07 -0500)]
Merge pull request #18049 from liewegas/wip-kv-iterator

kv/KeyValueDB: add column family

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
7 years agoMerge pull request #18156 from theanalyst/doc-changelog-rename
Sage Weil [Fri, 6 Oct 2017 17:55:59 +0000 (12:55 -0500)]
Merge pull request #18156 from theanalyst/doc-changelog-rename

doc: rename changelog with a .txt extension

7 years agoMerge pull request #17442 from tchaikov/wip-test-throttle
Kefu Chai [Fri, 6 Oct 2017 17:52:10 +0000 (01:52 +0800)]
Merge pull request #17442 from tchaikov/wip-test-throttle

test/throttle: kill tests exercising dtor of Throttle classes

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agodoc: rename changelog with a .txt extension 18156/head
Abhishek Lekshmanan [Fri, 6 Oct 2017 16:40:18 +0000 (18:40 +0200)]
doc: rename changelog with a .txt extension

Since this is used to x-ref in the release notes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoMerge pull request #18148 from theanalyst/doc-10.2.10-release-notes
Abhishek L [Fri, 6 Oct 2017 16:30:37 +0000 (18:30 +0200)]
Merge pull request #18148 from theanalyst/doc-10.2.10-release-notes

doc: release notes update for 10.2.10

Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-By: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18155 from smithfarm/wip-doc-releases-tweak
Sage Weil [Fri, 6 Oct 2017 16:06:46 +0000 (11:06 -0500)]
Merge pull request #18155 from smithfarm/wip-doc-releases-tweak

doc: improve links in doc/releases.rst

7 years agodoc: improve links in doc/releases.rst 18155/head
Nathan Cutler [Fri, 6 Oct 2017 15:49:01 +0000 (17:49 +0200)]
doc: improve links in doc/releases.rst

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agodoc: update releases table with v10.2.10 Jewel 18148/head
Abhishek Lekshmanan [Fri, 6 Oct 2017 15:05:36 +0000 (17:05 +0200)]
doc: update releases table with v10.2.10 Jewel

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agodoc: add release notes to v10.2.10 jewel
Abhishek Lekshmanan [Fri, 6 Oct 2017 09:15:11 +0000 (11:15 +0200)]
doc: add release notes to v10.2.10 jewel

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoMerge pull request #18153 from liewegas/wip-lts
Sage Weil [Fri, 6 Oct 2017 14:54:58 +0000 (09:54 -0500)]
Merge pull request #18153 from liewegas/wip-lts

doc/releases: drop LTS/stable line from second chart

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agodoc/releases: tweaks 18153/head
Sage Weil [Fri, 6 Oct 2017 14:18:40 +0000 (09:18 -0500)]
doc/releases: tweaks

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc/releases: drop LTS/stable line from second chart
Sage Weil [Fri, 6 Oct 2017 14:15:08 +0000 (09:15 -0500)]
doc/releases: drop LTS/stable line from second chart

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18152 from ceph/wip-fix-doc-exceptions
Abhishek L [Fri, 6 Oct 2017 13:55:46 +0000 (15:55 +0200)]
Merge pull request #18152 from ceph/wip-fix-doc-exceptions

doc raise exceptions with a base class

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18117 from liewegas/wip-lts
Sage Weil [Fri, 6 Oct 2017 13:53:56 +0000 (08:53 -0500)]
Merge pull request #18117 from liewegas/wip-lts

doc/releases: update release cycle docs

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agodoc/releases: update release cycle docs 18117/head
Sage Weil [Wed, 4 Oct 2017 21:28:50 +0000 (16:28 -0500)]
doc/releases: update release cycle docs

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18150 from xiexingguo/wip-21618
Xie Xingguo [Fri, 6 Oct 2017 13:50:18 +0000 (21:50 +0800)]
Merge pull request #18150 from xiexingguo/wip-21618

qa/standalone/scrub/osd-scrub-repair.sh: drop omap_digest flag

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc parse two lines for getting the context 18152/head
Alfredo Deza [Fri, 6 Oct 2017 12:57:01 +0000 (08:57 -0400)]
doc parse two lines for getting the context

So that signatures can get parsed when they are split like:

PG::RecoveryState::RepWaitBackfillReserved::react(
  const RemoteReservationCanceled &evt)

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18151 from theanalyst/doc-changelog-10.2.10
Sage Weil [Fri, 6 Oct 2017 12:34:29 +0000 (07:34 -0500)]
Merge pull request #18151 from theanalyst/doc-changelog-10.2.10

doc: Adding changelog for 10.2.10

7 years agodoc raise exceptions with a base class
Alfredo Deza [Fri, 6 Oct 2017 12:03:36 +0000 (08:03 -0400)]
doc raise exceptions with a base class

Although valid in very old Python, it is no longer possible to raise
"bare" exceptions without a class.

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc: Adding changelog for 10.2.10 18151/head
Abhishek Lekshmanan [Fri, 6 Oct 2017 11:52:29 +0000 (13:52 +0200)]
doc: Adding changelog for 10.2.10

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoqa/standalone/scrub/osd-scrub-repair.sh: drop omap_digest flag 18150/head
Sage Weil [Thu, 5 Oct 2017 16:16:31 +0000 (11:16 -0500)]
qa/standalone/scrub/osd-scrub-repair.sh: drop omap_digest flag

This is no longer set if we are backed by bluestore, which we are by
default.  See be078c8b7b131764caa28bc44452b8c5c2339623

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agotest/common/unittest_throttle: drop tests exercising dtors 17442/head
Kefu Chai [Fri, 6 Oct 2017 11:21:58 +0000 (19:21 +0800)]
test/common/unittest_throttle: drop tests exercising dtors

quote from Adam,

> let's just remove all the destructor tests. Since it's just exercising
> an assertion, it's most likely to be complexity that doesn't buy us
> much.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18064 from tchaikov/wip-vectors-equal
Kefu Chai [Fri, 6 Oct 2017 09:24:50 +0000 (17:24 +0800)]
Merge pull request #18064 from tchaikov/wip-vectors-equal

osd: replace vectors_equal() with operator==(vector<>, vector<>)

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge PR #18032 into master
Patrick Donnelly [Fri, 6 Oct 2017 02:37:03 +0000 (19:37 -0700)]
Merge PR #18032 into master

* refs/pull/18032/head:
Merge commit 'refs/pull/4/head' of github.com:batrick/ceph into ptl-tool-2
script/ptl-tool.py: Label Validation
Merge commit 'refs/pull/2/head' of github.com:batrick/ceph into ptl-tool-2
Merge commit 'refs/pull/1/head' of github.com:batrick/ceph into ptl-tool-2
script/ptl-tool.py: Fix the Comment example
script/ptl-tool.py: Fixed error message
ptl-tool: make more configurable and usable

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agogithubmap: update contributors
Patrick Donnelly [Fri, 6 Oct 2017 02:37:02 +0000 (19:37 -0700)]
githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge commit 'refs/pull/4/head' of github.com:batrick/ceph into ptl-tool-2 18032/head
Patrick Donnelly [Fri, 6 Oct 2017 02:35:09 +0000 (19:35 -0700)]
Merge commit 'refs/pull/4/head' of github.com:batrick/ceph into ptl-tool-2

* refs/pull/4/head:
  script/ptl-tool.py: Label Validation

7 years agoMerge pull request #18134 from liewegas/wip-21660
Gregory Farnum [Thu, 5 Oct 2017 22:30:13 +0000 (15:30 -0700)]
Merge pull request #18134 from liewegas/wip-21660

src/messages/MOSDMap: reencode OSDMap for older clients

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #17974 from jcsp/wip-doc-mgr-iptables
John Spray [Thu, 5 Oct 2017 20:48:05 +0000 (21:48 +0100)]
Merge pull request #17974 from jcsp/wip-doc-mgr-iptables

doc: update firewall doc to mention ceph-mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agosrc/messages/MOSDMap: reencode OSDMap for older clients 18134/head
Sage Weil [Thu, 5 Oct 2017 20:26:16 +0000 (15:26 -0500)]
src/messages/MOSDMap: reencode OSDMap for older clients

We explicitly select which missing bits trigger a reencode.  We
already had jewel and earlier covered, but kraken includes all of
the previously mentioned bits but not SERVER_LUMINOUS.  This
prevents kraken clients from decoding luminous maps.

Fixes: http://tracker.ceph.com/issues/21660
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18070 from liewegas/wip-21613
Sage Weil [Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -0500)]
Merge pull request #18070 from liewegas/wip-21613

osd: fix replica/backfill target handling of REJECT

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agokv/RocksDBStore: fix default CF handling 18049/head
Sage Weil [Thu, 5 Oct 2017 13:31:04 +0000 (08:31 -0500)]
kv/RocksDBStore: fix default CF handling

We need to close the default CF handle *only* if we explicitly opened it.

Also, take care to use that handle wherever we can.  This is mostly
paranoia--I'm not sure if rocksdb cares if you mix the handle you opened
with DefaultColumnFamily(), which is different.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: make the PG's SORTBITWISE assert a more generous shutdown 18047/head
Greg Farnum [Fri, 29 Sep 2017 22:18:26 +0000 (15:18 -0700)]
osd: make the PG's SORTBITWISE assert a more generous shutdown

We want to stop working if we get activated while sortbitwise is not set
on the cluster, but we might have old maps where it wasn't if the flag
was changed recently. And doing it in the PG code was a bit silly anyway.

Instead check SORTBITWISE in the main OSDMap handling code prior to
prepublishing it. Let it go through if we aren't active at the time.

Fixes: http://tracker.ceph.com/issues/20416
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #17939 from mkogan1/wip-rgw-21196
Matt Benjamin [Thu, 5 Oct 2017 17:43:09 +0000 (13:43 -0400)]
Merge pull request #17939 from mkogan1/wip-rgw-21196

rgw: update the usage read iterator in truncated scenario

7 years agoMerge pull request #18028 from liewegas/wip-pick-ifname
Sage Weil [Thu, 5 Oct 2017 17:02:49 +0000 (12:02 -0500)]
Merge pull request #18028 from liewegas/wip-pick-ifname

common/pick_address: add {public,cluster}_network_interface option

Reviewed-by: Dan Mick <dmick@redhat.com>
7 years agoMerge pull request #18091 from vasilyMellanox/gid_idx_fix
Sage Weil [Thu, 5 Oct 2017 16:19:15 +0000 (11:19 -0500)]
Merge pull request #18091 from vasilyMellanox/gid_idx_fix

msg/async/rdma: uninitialized variable fix

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18092 from tchaikov/wip-cmake-cleanup
Sage Weil [Thu, 5 Oct 2017 16:18:27 +0000 (11:18 -0500)]
Merge pull request #18092 from tchaikov/wip-cmake-cleanup

cmake: do not link against unused or duplicated libraries

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18094 from xiexingguo/wip-tracker-21618
Sage Weil [Thu, 5 Oct 2017 16:14:01 +0000 (11:14 -0500)]
Merge pull request #18094 from xiexingguo/wip-tracker-21618

qa/standalone/scrub/osd-scrub-repair.sh: add extents flag into object_info_t

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17907 from amitkumar50/cov-rgw-10
Yuri Weinstein [Thu, 5 Oct 2017 15:46:39 +0000 (08:46 -0700)]
Merge pull request #17907 from amitkumar50/cov-rgw-10

rgw: Ignoring the returned error

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #18106 from kmroz/wip-keystone-revocator-thread-assert
Yuri Weinstein [Thu, 5 Oct 2017 15:45:54 +0000 (08:45 -0700)]
Merge pull request #18106 from kmroz/wip-keystone-revocator-thread-assert

rgw: stop/join TokenCache revoke thread only if started.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agodoc/releases: drop LTS vs stable from chart; update luminous eol data
Sage Weil [Wed, 4 Oct 2017 22:05:15 +0000 (17:05 -0500)]
doc/releases: drop LTS vs stable from chart; update luminous eol data

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18120 from liewegas/wip-bluefs-allocation
Sage Weil [Thu, 5 Oct 2017 14:13:46 +0000 (09:13 -0500)]
Merge pull request #18120 from liewegas/wip-bluefs-allocation

os/bluestore: make bluefs behave better near enospc

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #18114 from dillaman/wip-21670
Mykola Golub [Thu, 5 Oct 2017 12:34:09 +0000 (15:34 +0300)]
Merge pull request #18114 from dillaman/wip-21670

librbd: list_children should not attempt to refresh image

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18118 from liewegas/wip-21470
Sage Weil [Thu, 5 Oct 2017 11:57:14 +0000 (06:57 -0500)]
Merge pull request #18118 from liewegas/wip-21470

os/bluestore: fix another aio stall/deadlock

Reviewed-by: Varada Kari <varada.kari@gmail.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #18105 from gregsfortytwo/wip-sigpipe-porting
Sage Weil [Thu, 5 Oct 2017 03:07:26 +0000 (22:07 -0500)]
Merge pull request #18105 from gregsfortytwo/wip-sigpipe-porting

msg: reimplement sigpipe blocking

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17710 from Songweibin/wip-add-pybind
Sage Weil [Thu, 5 Oct 2017 03:06:10 +0000 (22:06 -0500)]
Merge pull request #17710 from Songweibin/wip-add-pybind

pybind/rados: add support open_ioctx2 API

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #18079 from liewegas/wip-21618
Sage Weil [Thu, 5 Oct 2017 03:05:20 +0000 (22:05 -0500)]
Merge pull request #18079 from liewegas/wip-21618

qa/standalone/scrub/osd-scrub-repair: no -y to diff

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #18088 from dillaman/wip-21629
Sage Weil [Thu, 5 Oct 2017 03:04:33 +0000 (22:04 -0500)]
Merge pull request #18088 from dillaman/wip-21629

osd: additional protection for out-of-bounds EC reads

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: use separate CF for omap and deferred
Sage Weil [Mon, 2 Oct 2017 20:50:23 +0000 (15:50 -0500)]
os/bluestore: use separate CF for omap and deferred

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: define PREFIX_ALLOC_BITMAP
Sage Weil [Mon, 2 Oct 2017 20:49:46 +0000 (15:49 -0500)]
os/bluestore: define PREFIX_ALLOC_BITMAP

This was hard-coded to 'b'.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agokv/RocksDBStore: simplify CF merge operator routing
Sage Weil [Mon, 2 Oct 2017 18:35:07 +0000 (13:35 -0500)]
kv/RocksDBStore: simplify CF merge operator routing

Merge operators always map to a prefix, just like a CF, so we can link
directly to the operator without doing any lookup.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agokv/RocksDBStore: add CF support
Jianjian Huo [Fri, 29 Sep 2017 22:03:05 +0000 (17:03 -0500)]
kv/RocksDBStore: add CF support

- detect and use existing CFs on open

Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com>
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/monthrash: tolerate PG_AVAILABILITY during mon thrashing 18122/head
Sage Weil [Thu, 5 Oct 2017 02:26:56 +0000 (21:26 -0500)]
qa/suites/rados/monthrash: tolerate PG_AVAILABILITY during mon thrashing

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoscript/ptl-tool.py: Label Validation
Jos Collin [Thu, 5 Oct 2017 01:52:32 +0000 (07:22 +0530)]
script/ptl-tool.py: Label Validation

Validated the label and verified the existence of the label at the beginning of build_branch().
This will avoid:
* Assigning invalid testing labels like 'abcd' and other existing labels like 'bug', 'cleanup' etc; as testing labels
* Stops spamming the Label list in the Ceph repo by creating new (invalid format) labels everytime. The labels can be created manually in github and ptl-tool only uses them.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge commit 'refs/pull/2/head' of github.com:batrick/ceph into ptl-tool-2
Patrick Donnelly [Wed, 4 Oct 2017 23:49:20 +0000 (16:49 -0700)]
Merge commit 'refs/pull/2/head' of github.com:batrick/ceph into ptl-tool-2

* refs/pull/2/head:
  script/ptl-tool.py: Fixed error message

7 years agoMerge commit 'refs/pull/1/head' of github.com:batrick/ceph into ptl-tool-2
Patrick Donnelly [Wed, 4 Oct 2017 23:48:27 +0000 (16:48 -0700)]
Merge commit 'refs/pull/1/head' of github.com:batrick/ceph into ptl-tool-2

* refs/pull/1/head:
  script/ptl-tool.py: Fix the Comment example

7 years agoos/bluestore: add bluestore_bluefs_min_free 18120/head
Sage Weil [Tue, 3 Oct 2017 16:18:17 +0000 (11:18 -0500)]
os/bluestore: add bluestore_bluefs_min_free

We need at least ~1GB free so we can write out new SSTs (which are 256MB
each).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore/BlueFS: crash on enospc
Sage Weil [Tue, 3 Oct 2017 15:41:33 +0000 (10:41 -0500)]
os/bluestore/BlueFS: crash on enospc

We were passing this error back to rocksdb, which would then crash (much)
later with a corrupted SST file!  No good.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: use normal Context for async deferred_try_submit 18118/head
Sage Weil [Tue, 3 Oct 2017 21:48:37 +0000 (16:48 -0500)]
os/bluestore: use normal Context for async deferred_try_submit

I'm not quite sure why the FunctionContext did not ever execute on the
finisher thread (perhaps the [&] captured some state on the stack that it
shouldn't have?).  In any case, using a traditional Context here appears
to resolve the problem (of the async deferred_try_submit() never executing,
leading to a bluestore stall/deadlock).

Fixes: http://tracker.ceph.com/issues/21470
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: wake kv thread when blocking on deferred_bytes
Sage Weil [Fri, 29 Sep 2017 18:47:19 +0000 (13:47 -0500)]
os/bluestore: wake kv thread when blocking on deferred_bytes

We need to wake the kv thread whenever setting deferred_aggressive to
ensure that txns with deferred io that have committed but haven't submitted
their deferred writes get submitted.  This aligns us with the other
users of deferred_aggressive (e.g., _osr_drain_all).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18099 from dillaman/wip-21628
Mykola Golub [Wed, 4 Oct 2017 20:31:55 +0000 (23:31 +0300)]
Merge pull request #18099 from dillaman/wip-21628

librbd: journal should ignore -EILSEQ errors from compare-and-write

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoosd/PG: add explicit CANCEL MBackfillReserve type 18070/head
Sage Weil [Wed, 4 Oct 2017 20:30:14 +0000 (15:30 -0500)]
osd/PG: add explicit CANCEL MBackfillReserve type

This lets us distinguish between REJECT and CANCEL for clarity.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: separate event for RemoteReservationCanceled
Sage Weil [Wed, 4 Oct 2017 20:28:26 +0000 (15:28 -0500)]
osd/PG: separate event for RemoteReservationCanceled

Right now we transparently map a RemoteReservationRejected into a
*Canceled event because this what peers send over the wire.  Even
once new peers start sending and explicit CANCEL, old peers will
still do so, so we'll maintain this mapping for a while.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17959 from gaosibei/branch2
Marcus Watts [Wed, 4 Oct 2017 20:12:21 +0000 (16:12 -0400)]
Merge pull request #17959 from gaosibei/branch2

RGW: Multipart upload may double the quota

7 years agoosd/PG: separate verb 'Reject' from passive 'rejected'
Sage Weil [Wed, 4 Oct 2017 19:55:15 +0000 (14:55 -0500)]
osd/PG: separate verb 'Reject' from passive 'rejected'

This reduces pg->reject_reservation() callsites from 2 to 1 and
makes the state transitions a bit more explicit.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18087 from liu-chunmei/fix_dpdk_build
Sage Weil [Wed, 4 Oct 2017 19:01:21 +0000 (14:01 -0500)]
Merge pull request #18087 from liu-chunmei/fix_dpdk_build

build: fix dpdk build error

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #18115 from mogeb/rados-doc
Sage Weil [Wed, 4 Oct 2017 18:59:58 +0000 (13:59 -0500)]
Merge pull request #18115 from mogeb/rados-doc

doc: add osd_max_object_size in osd configuration

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18072 from dragonylffly/wip-optimize-assert
Sage Weil [Wed, 4 Oct 2017 18:59:19 +0000 (13:59 -0500)]
Merge pull request #18072 from dragonylffly/wip-optimize-assert

assert(false)->ceph_abort()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
7 years agoMerge pull request #18073 from dragonylffly/wip-check-monitor-address-configuration
Sage Weil [Wed, 4 Oct 2017 18:58:48 +0000 (13:58 -0500)]
Merge pull request #18073 from dragonylffly/wip-check-monitor-address-configuration

mon: check monitor address configuration

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18082 from Liuchang0812/wip-21624
Sage Weil [Wed, 4 Oct 2017 18:58:09 +0000 (13:58 -0500)]
Merge pull request #18082 from Liuchang0812/wip-21624

os/bluestore: make BlueStore opened by start_kv_only umountable

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18083 from Liuchang0812/wip-21625
Sage Weil [Wed, 4 Oct 2017 18:56:26 +0000 (13:56 -0500)]
Merge pull request #18083 from Liuchang0812/wip-21625

tool: ceph-kvstore-tool doesn't umount BlueStore properly

Reviewed-by: Sage Weil <sage@redhat.com>
7 years ago fix dpdk build error. 18087/head
chunmei [Wed, 4 Oct 2017 18:25:15 +0000 (11:25 -0700)]
fix dpdk build error.
    when ./do_cmake.sh add  -DWITH_DPDK=ON -DUSE_CRYPTOPP=ON -DWITH_NSS=OFF -DWITH_TESTS=OFF
    if build debian package, need remove some file froms install since we disabled TESTS.

Signed-off-by: chunmei <chunmei.liu@intel.com>
7 years agodoc: add osd_max_object_size in osd configuration 18115/head
Mohamad Gebai [Wed, 4 Oct 2017 16:45:48 +0000 (12:45 -0400)]
doc: add osd_max_object_size in osd configuration

Having osd_max_write_size in the doc without osd_max_object_size
is confusing.

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
7 years agoMerge pull request #18110 from ceph/wip-volume-api-change
Andrew Schoen [Wed, 4 Oct 2017 16:13:25 +0000 (11:13 -0500)]
Merge pull request #18110 from ceph/wip-volume-api-change

ceph-volume lvm api refactor/move

Reviewed By: Andrew Schoen <aschoen@redhat.com>

7 years agoMerge pull request #17380 from ceph/wip-21189
Kefu Chai [Wed, 4 Oct 2017 15:10:30 +0000 (23:10 +0800)]
Merge pull request #17380 from ceph/wip-21189

mgr/status: format byte quantities in base 2 multiples

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agolibrbd: list_children should not attempt to refresh image 18114/head
Jason Dillaman [Wed, 4 Oct 2017 14:46:46 +0000 (10:46 -0400)]
librbd: list_children should not attempt to refresh image

The snap_lock is being held when this method is invoked, which can
result in a deadlock.

Fixes: http://tracker.ceph.com/issues/21670
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17746 from elliswuuuuuuuu/wip-prometheus
John Spray [Wed, 4 Oct 2017 14:13:45 +0000 (15:13 +0100)]
Merge pull request #17746 from elliswuuuuuuuu/wip-prometheus

ceph-mgr: can not change prometheus port for mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoRevert "REVERT msgr: force use of the SIGPIPE stopper for testing" 18105/head
Greg Farnum [Wed, 4 Oct 2017 00:06:54 +0000 (17:06 -0700)]
Revert "REVERT msgr: force use of the SIGPIPE stopper for testing"

This reverts commit a76181df4a71ad15aee8dd2e4adcebce8330fae4.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
7 years agoREVERT msgr: force use of the SIGPIPE stopper for testing
Greg Farnum [Tue, 3 Oct 2017 22:55:24 +0000 (15:55 -0700)]
REVERT msgr: force use of the SIGPIPE stopper for testing

Note that since this sets MSG_NOSIGNAL to 0 it won't take effect
on the ::send[msg] invocations

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
7 years agomsgr: add a mechanism for Solaris to avoid dying on SIGPIPE
Greg Farnum [Tue, 3 Oct 2017 22:54:06 +0000 (15:54 -0700)]
msgr: add a mechanism for Solaris to avoid dying on SIGPIPE

This is fairly clean: we define an RAII object in the Messenger.h on
Solaris, and "declare" it with a macro in the implementations. There's
no code duplication and on Linux it's just entirely compiled out.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
7 years agoRevert "SIGPIPE suppression for platforms without SO_NOSIGPIPE or MSG_NOSIGNAL"
Greg Farnum [Tue, 3 Oct 2017 22:06:25 +0000 (15:06 -0700)]
Revert "SIGPIPE suppression for platforms without SO_NOSIGPIPE or MSG_NOSIGNAL"

This reverts commit 131deb39769c1187c334ee84f552d3be01f1751b. It added
code that shouldn't have entered the project repo.

Conflicts:
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncConnection.h
src/msg/simple/Pipe.cc
src/msg/simple/Pipe.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #18089 from liewegas/wip-localpool-min-size
Sage Weil [Wed, 4 Oct 2017 13:26:07 +0000 (08:26 -0500)]
Merge pull request #18089 from liewegas/wip-localpool-min-size

mgr/localpool: default to 3x; allow min_size adjustment

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agomgr/localpool: fix rule selection 18089/head
Sage Weil [Wed, 4 Oct 2017 13:25:38 +0000 (08:25 -0500)]
mgr/localpool: fix rule selection

The 'osd pool create' arg parsing is broken; the rule name for
'ceph osd pool create $name $numpgs replicated $rulename' is passed
via the erasure_code_profile param.  Too many req=false options
without a way to disambiguate them.

Work around it by passing both 'rule' and 'erasure_code_profile'
keys, so that if/when the hack in OSDMonitor.cc is removed it will
still work.  Blech.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph-volume tests move lvm api tests into its new test module 18110/head
Alfredo Deza [Wed, 4 Oct 2017 10:44:54 +0000 (06:44 -0400)]
ceph-volume tests move lvm api tests into its new test module

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests refactor lvm api import for test_listing
Alfredo Deza [Wed, 4 Oct 2017 10:43:36 +0000 (06:43 -0400)]
ceph-volume tests refactor lvm api import for test_listing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests refactor lvm api import for api tests
Alfredo Deza [Wed, 4 Oct 2017 10:43:18 +0000 (06:43 -0400)]
ceph-volume tests refactor lvm api import for api tests

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests refactor lvm api import for activate tests
Alfredo Deza [Wed, 4 Oct 2017 10:42:47 +0000 (06:42 -0400)]
ceph-volume tests refactor lvm api import for activate tests

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests refactor lvm api import in conftest
Alfredo Deza [Wed, 4 Oct 2017 10:42:01 +0000 (06:42 -0400)]
ceph-volume tests refactor lvm api import in conftest

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume devices.lvm refactor importing api to come from api/lvm.py
Alfredo Deza [Tue, 3 Oct 2017 20:17:08 +0000 (16:17 -0400)]
ceph-volume devices.lvm refactor importing api to come from api/lvm.py

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume move lvm/api.py to api/lvm.py so disk can consume it
Alfredo Deza [Tue, 3 Oct 2017 20:14:16 +0000 (16:14 -0400)]
ceph-volume move lvm/api.py to api/lvm.py so disk can consume it

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume create an api module to hold common api modules
Alfredo Deza [Tue, 3 Oct 2017 20:13:33 +0000 (16:13 -0400)]
ceph-volume create an api module to hold common api modules

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoscript/ptl-tool.py: Fix the Comment example
Jos Collin [Tue, 3 Oct 2017 04:31:59 +0000 (10:01 +0530)]
script/ptl-tool.py: Fix the Comment example

The example shown in the comment needs export to work as expected.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18048 from badone/wip-boost-mirrors
Kefu Chai [Wed, 4 Oct 2017 02:28:35 +0000 (10:28 +0800)]
Merge pull request #18048 from badone/wip-boost-mirrors

make-dist,cmake: Try multiple URLs to download boost before failing

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomake-dist,cmake: Try multiple URLs to download boost before failing 18048/head
Brad Hubbard [Thu, 28 Sep 2017 05:28:53 +0000 (15:28 +1000)]
make-dist,cmake: Try multiple URLs to download boost before failing

Remove SPOF during boost download for make-dist and later cmake > 3.7

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agorgw: stop/join TokenCache revoke thread only if started. 18106/head
Karol Mroz [Mon, 2 Oct 2017 21:01:47 +0000 (14:01 -0700)]
rgw: stop/join TokenCache revoke thread only if started.

Thread::join triggers an assert otherwise.

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

Signed-off-by: Karol Mroz <kmroz@suse.de>
7 years agoMerge pull request #18097 from dillaman/wip-21663
Mykola Golub [Tue, 3 Oct 2017 20:39:54 +0000 (23:39 +0300)]
Merge pull request #18097 from dillaman/wip-21663

qa/workunits/rbd: fixed variable name for resync image id

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agolibrbd: journal should ignore -EILSEQ errors from compare-and-write 18099/head
Jason Dillaman [Tue, 3 Oct 2017 19:42:50 +0000 (15:42 -0400)]
librbd: journal should ignore -EILSEQ errors from compare-and-write

Fixes: http://tracker.ceph.com/issues/21628
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/standalone/scrub/osd-scrub-repair: no -y to diff 18079/head
Sage Weil [Mon, 2 Oct 2017 13:23:11 +0000 (08:23 -0500)]
qa/standalone/scrub/osd-scrub-repair: no -y to diff

With -y you can't see the entire line when it is long, which is
needed to identify the diff failure in
http://tracker.ceph.com/issues/21618

Instead, let the interactive user specify the option if they want it.

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