Commit Graph

43936 Commits

Author SHA1 Message Date
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
Rohan Mars
fc02a8adfb added boost timegm impl for cross platform support
Signed-off-by: Rohan Mars <code@rohanmars.com>
2015-08-25 10:01:03 -07: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
Zhiqiang Wang
8c2f8bf54b osd: no bother to create RecoveryCtx if no recovery op is started
If there is no recovery op started, there is no need to create a RecoveryCtx
and later delete all of the things in it.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-25 16:10:23 +08:00
Zhiqiang Wang
178d4d5c0c osd: remove unused parameter of start_recovery_ops
The RecoveryCtx parameter is not needed.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-25 16:10:10 +08: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
Yehuda Sadeh
8ef2c9654e buffer: modify inline memory ops to use packed structs
packed structs can be used to ensure alignment is not an issue.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-24 16:52:45 -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
Abhishek Lekshmanan
136242b561 rgw: be more flexible with iso8601 timestamps
make parsing 8601 more flexible by not restricting the length of seconds
to 5, this allows timestamp to be specified both as ms or us. Newer
keystone backends such as fernet token backend default to microseconds
when publishing iso8601 timestamps, so this allows these timestamps to
be allowed when specifying the token expiry time.

Fixes: #12761
Reported-by: Ian Unruh <ianunruh@gmail.com>
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-08-24 23:11:35 +05:30
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
Sage Weil
151c051105 common/Mutex: avoid trylock on lock if instrumentation is not enabled
Benchmarks have shown that the trylock in the lock path has a high
latency cost.  Only pay the penalty if instrumentation is actually
enabled.

While we are at it, avoid the duplicate conditional check so that
the fast path is faster.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-23 14:02:59 -04:00
Kefu Chai
2c7fe2bc2d osd: remove unused ctor
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-23 17:32:37 +08:00
Kefu Chai
ff087f9e01 osd: remove useless hitset code
* we do not persist current hit set using get_hit_set_current_object()
  anymore, instead we always append current hitset into archive even
  !hitset.is_full(), see fbd9c15. so it's not necessary to remove the
  current hitset object before putting it to disk.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-23 17:32:37 +08:00
Kefu Chai
cc2bcf760f mon: print use_gmt_hitset in "ceph osd pool get"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-23 17:32:37 +08:00
Kefu Chai
03a1a3cf02 mon: add "ceph osd pool set $pool use_gmt_hitset true" cmd
allow "ceph osd pool set $pool use_gmt_hitset <true|1>" as long as
the cluster supports gmt hitset.

Fixes: #9732
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-23 17:32:37 +08:00
Kefu Chai
42f8c5daad osd: use GMT time for the object name of hitsets
* bump the encoding version of pg_hit_set_info_t to 2, so we can
  tell if the corresponding hit_set is named using localtime or
  GMT
* bump the encoding version of pg_pool_t to 20, so we can know
  if a pool is using GMT to name the hit_set archive or not. and
  we can tell if current cluster allows OSDs not support GMT
  mode or not.
* add an option named `osd_pool_use_gmt_hitset`. if enabled,
  the cluster will try to use GMT mode when creating a new pool
  if all the the up OSDs support GMT mode. if any of the
  pools in the cluster is using GMT mode, then only OSDs
  supporting GMT mode are allowed to join the cluster.

Fixes: #9732
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-23 17:32:37 +08: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
Sage Weil
0f82f461b3 crush/CrushTester: test fewer inputs when running crushtool
If there are a lot of crush rules (say, 100) then the test can
take a long time.  100 values per rule should be enough to catch
most issues.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-21 17:45:27 -04:00
Sage Weil
ea8609b25a mon/OSDMonitor: debug why pool creation fails
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-21 17:45:27 -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