Commit Graph

43809 Commits

Author SHA1 Message Date
Boris Ranto
c318129ba1 ceph.spec.in: Restart services only if they are running
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-26 13:54:12 +02:00
Orit Wasserman
83b93eb7b9 Merge pull request #5639 from rzarzynski/wip-12750
rgw: fix removal during iteration over Swift metadata in filter_out_temp_url()
2015-08-26 10:37:33 +02:00
Sage Weil
23ebeb3684 Merge pull request #5629 from kylinstorage/wip-nocache_skip_promote-v3
Avoid cache pollution by rbd export etc v2

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-25 21:48:31 -04:00
Sage Weil
8c08b6b061 Merge pull request #5636 from liewegas/wip-12747
make EC plugin path static

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-25 21:47:35 -04:00
Sage Weil
4bd73150c5 Merge pull request #5646 from liewegas/wip-12766
osd: wait for cleanup from bench
2015-08-25 21:47:06 -04:00
Sage Weil
f889151e46 Merge pull request #5650 from liewegas/wip-12736
uuid: use boost::random:random_device

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-25 21:46:11 -04:00
Sage Weil
5d58dd2ec7 Merge pull request #5654 from ceph/wip-12614
config: skip lockdep for intentionally recursive md_config_t lock

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-25 14:39:57 -04:00
Josh Durgin
cca0d58723 Merge pull request #5647 from ceph/wip-12765
librbd: error closing image while set to invalid snapshot

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-25 14:16:44 -04:00
Josh Durgin
6b4b85a528 Merge pull request #4677 from tchaikov/wip-fix-type-error-in-crush-rule
pybind: Avoid type error in crush rule (str, not an int)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-25 12:08:50 -04:00
Sage Weil
4628c5175a Merge pull request #5659 from badone/doc_writeback_typo
doc: Fix typo in writeback throttle section
2015-08-25 11:54:43 -04:00
Sage Weil
dfb9fea3a9 Merge pull request #5660 from badone/doc_snaps_typo
doc: Fix typo and redundant word in snaps section
2015-08-25 11:54:29 -04:00
Josh Durgin
6886d453c0 Merge pull request #5648 from ceph/wip-10399
Objecter: pg_interval_t::is_new_interval needs pgid from previous pool

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-25 11:23:35 -04:00
Sage Weil
a5aa415074 Merge pull request #5663 from ritz303/wip-doc-12771
doc: Added "Hammer" in the list of major releases.
2015-08-25 11:14:42 -04:00
ritz303
582f0f6445 doc: Added "Hammer" in the list of major releases.
Fixes: #12771

Signed-off-by: ritz303 <ritz_303@yahoo.com>
2015-08-25 10:02:49 -05:00
Ken Dreyer
6be5606bdb Merge pull request #5661 from SUSE/wip-suse-sysvinit-cleanup
ceph.spec.in: drop sysvinit-specific macros that run only on SUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-08-25 08:07:23 -06:00
Nathan Cutler
d0386d2347 ceph.spec.in: drop sysvinit-specific macros that run only on openSUSE/SLE
All sysvinit-based versions of openSUSE/SLE are EOL as far as upstream Ceph is
concerned.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-08-25 13:49:47 +02:00
Kefu Chai
665de0a91f Merge pull request #5657 from badone/master
doc: Fix typo in recovery reservation section

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-25 19:35:53 +08:00
Brad Hubbard
699fca8089 doc: Fix typo and redundant word in snaps section
Fix typo and remove identifying from "filtering identifying" in
doc/dev/osd_internals/snaps.rst

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-08-25 21:31:43 +10:00
Brad Hubbard
4dffc1672f doc: Fix typo in writeback throttle section
Fix typo in doc/dev/osd_internals/wbthrottle.rst

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-08-25 21:14:55 +10:00
Brad Hubbard
6ee7068c4c doc: Fix typo in writeback throttle section
Fix typo in doc/dev/osd_internals/wbthrottle.rst

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-08-25 21:04:55 +10:00
Brad Hubbard
07a28d6ce2 doc: Fix typo in recovery reservation section
Fix typo in doc/dev/osd_internals/recovery_reservation.rst

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-08-25 20:51:09 +10:00
Orit Wasserman
b2028b79a3 Merge pull request #5607 from rzarzynski/wip-12724
rgw: fix error handling during GET on object through Swift API.
2015-08-25 12:11:56 +02:00
Sage Weil
71eb7be267 Merge pull request #5563 from varadakari/wip-kvstore-keyformat
Change key format to preserve order of keys in backend db.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-24 22:15:57 -04:00
Josh Durgin
415226995e config: skip lockdep for intentionally recursive md_config_t lock
lockdep can't handle recursive locks, resulting in false positive
reports for certain set_val_or_die() calls, like via
md_config_t::parse_argv() passed "-m".

Fixes: #12614
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-08-24 15:40:39 -07:00
Josh Durgin
9f2aad87c0 Merge pull request #5649 from ceph/wip-12764
tests: fixed rbd cli cram integration tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-24 18:15:41 -04:00
Sage Weil
dbcaa54485 uuid: use boost::random:random_device
The boost mt code uses uninitialized memory for extra randomness,
which is a bad idea in general but more importantly makes valgrind
unhappy.  Use /dev/urandom instead.

Unfortunately this introduces a link time dependency.. meh!

Fixes: #12736
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-24 14:51:47 -04:00
Yehuda Sadeh
034712290f Merge pull request #5617 from rzarzynski/wip-12728
rgw: url_decode bucket name and prefix from X-Object-Manifest during GET on Swift DLO.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-24 09:59:55 -07:00
Jason Dillaman
fd72577188 tests: fixed rbd cli cram integration tests
Fixes: #12764
Backport: infernalis
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-08-24 11:42:26 -04:00
Jason Dillaman
f20f7a23e9 Objecter: pg_interval_t::is_new_interval needs pgid from previous pool
When increasing the pg_num of a pool, an assert would fail since the
calculated pgid seed would be for the pool's new pg_num value instead
of the previous pg_num value.

Fixes: #10399
Backport: infernalis, hammer, firefly
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-08-24 11:12:13 -04:00
Jason Dillaman
cd6ac726dd librbd: error closing image while set to invalid snapshot
With cache disabled, closing the image will result in a flush
which might result in the image being refreshed.  If this happens
while the image is set to an invalid snapshot, an error will be
returned while closing the image.

Fixes: #12765
Backport: infernalis
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-08-24 11:02:10 -04:00
Sage Weil
622d22e2d4 osd: wait for cleanup from bench
We need to wait for cleanup to flush before we destroy the
sequencer or else we get a use-after-free.

Introduced e7bbafa3bf.

Fixes: #12766
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-24 11:00:13 -04:00
Sage Weil
888a6337ab doc/release-notes: v9.0.3
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-24 09:36:08 -04:00
Sage Weil
6698079515 Merge remote-tracking branch 'gh/next' 2015-08-24 08:35:06 -04:00
Kefu Chai
fba67606ff Merge pull request #5623 from yuyuyu101/wip-12729
Fix compile warning unused-result

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-24 20:07:55 +08:00
Yunchuan Wen
d2e4fe363c set skip promote flag if NOCACHE or DONTNEED flag set
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-24 01:18:36 +00:00
Loic Dachary
2d92f4cba5 Merge pull request #5493 from dachary/wip-10887-shec
erasure-code: shec plugin feature

Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-22 23:22:50 +02:00
Kefu Chai
5a20f2804f Merge pull request #5631 from wonzhq/finish-ctx
osd: consolidate encoding snaps into pg log code in finish_ctx

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-22 09:22:00 +08:00
Sage Weil
0045b8dd93 PendingReleaseNotes: make a note about KeyValueStore on-disk format change
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-21 17:52:52 -04:00
Sage Weil
c4aa935f7f Merge pull request #5611 from ceph/wip-newstore-misc
osd: final prereq patches for newstore

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-21 17:53:58 -04:00
Radoslaw Zarzynski
7c08c54fec rgw: fix dangerous removal from STL map in filter_out_temp_url().
Fixes: #12750
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015-08-21 22:29:47 +02:00
Sage Weil
88bfd79669 test/erasure-code: drop directory from profile
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-21 16:03:30 -04:00
Sage Weil
5df12716b1 do not include directory in ec profiles
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-21 16:03:30 -04:00
Sage Weil
660ae5bcbb osd: always load erasure plugins from the configured directory
Ignore the profile 'directory' field.

This ensures that we can always find plugins even when teh cluster
is installed across a mix of distros.

Rename the option to have no osd_ (or mon_) prefix since anybody
may use the ec factory/plugin code.

We still hard-code .libs in the unit tests... sigh.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-21 16:03:30 -04:00
Jenkins
7295612d29 9.0.3 2015-08-21 12:46:32 -07:00
Loic Dachary
271513f8f0 erasure-code: shec plugin feature
There is one new plugin (shec). When upgrading a cluster, there
must be a protection against the following scenario:

   * the mon are upgraded but not the osd
   * a new pool is created using plugin shec
   * the osd fail to load the shec plugin because they have not been
     upgraded

A feature bit is added : PLUGINS_V3. The monitor will only agree to
create an erasure code profile for the shec plugin if all OSDs
supports PLUGINS_V3. Once such an erasure code profile is stored in the
OSDMap, an OSD can only boot if it supports the PLUGINS_V3 feature,
which means it is able to load the shec plugin.

The monitors will only activate the PLUGINS_V3 feature if all monitors
in the quorum support it. It protects against the following scenario:

   * the leader is upgraded the peons are not upgraded
   * the leader creates a pool with plugin=shec because all OSD have
     the PLUGINS_V3 feature
   * the leader goes down and a non upgraded peon becomes the leader
   * an old OSD tries to join the cluster
   * the new leader will let the OSD boot because it does not contain
     the logic that would excluded it
   * the old OSD will fail when required to load the plugin shec

This is going to be needed each time new plugins are added, which is
impractical. A more generic plugin upgrade support should be added
instead, as described in http://tracker.ceph.com/issues/7291.

See also 9687150cea for the PLUGINS_V2
implementation.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-08-21 21:27:04 +02:00
Gregory Farnum
929cf29fb3 Merge pull request #5634 from ceph/wip-fix-FTBFS-boost
rbd: fix the FTBFS on old boost introduced by 2050d08
2015-08-21 14:49:53 +01:00
Kefu Chai
2d13a47203 rbd: fix the FTBFS on old boost introduced by 2050d08
in boost 1.49, BOOST_SCOPE_EXIT() does not accept capture_tuple,
only `(capture) (capture) ...` is supported.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-21 21:41:01 +08:00
Gregory Farnum
bfc259efe5 Merge pull request #5583 from ceph/wip-12676
mds: check mds up before calling MDSMap::get_mds_info

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-08-21 13:11:46 +01:00
Kefu Chai
6425111861 Merge pull request #5587 from caibo2014/master
rbd: remove the output file if rbd export-diff fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-21 19:33:59 +08:00
Gregory Farnum
2daccff5de Merge pull request #5632 from ceph/wip-fix-ftbfs-4998
osd: fix the FTBFS introduced by be28319

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-08-21 12:22:34 +01:00