Commit Graph

34626 Commits

Author SHA1 Message Date
Samuel Just
fe99b25317 Merge pull request #2179 from ceph/wip-8982
osd: fix cache pools without hit_sets configured

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-07-31 11:28:04 -07:00
Sage Weil
383536a2ef mon/OSDMonitor: warn when cache pools do not have hit_sets configured
Give users a clue when cache pools are enabled but the hit_set is not
configured.  Note that technically this will work, but not well, so for
now let's just steer them away.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-31 11:03:19 -07:00
Sage Weil
caf554bf2f osd/ReplicatedPG: improve agent_choose_mode args
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-31 11:03:19 -07:00
Sage Weil
ce4e559d29 vstart.sh: limit open files
Most users only get 1024 fds.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-31 11:03:19 -07:00
Sage Weil
ea4996d3ef osd/ReplicatedPG: evict blindly if there is no hit_set
If there is no hit set for a PG, blindly evict objects.  This avoids an
assert(hit_set) in agent_estimate_atime_temp().

Fixes: #8982
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-31 11:03:18 -07:00
Sage Weil
5d1c76f641 osd/ReplicatedPG: check agent_mode if agent is enabled but hit_sets aren't
It is probably not a good idea to try to run the tiering agent without a
hit_set to inform its actions, but it is technically possible.  For
example, one could simply blindly evict when we reach the full point.
However, this doesn't work because the agent mode is guarded by a hit_set
check, even though agent_setup() is not.  Fix that.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-31 11:03:18 -07:00
Gregory Farnum
f3d1f396f9 Merge pull request #2173 from ceph/wip-8969
fix i386 atomics

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-07-31 08:59:00 -04:00
Sage Weil
5c6a051220 Merge pull request #2162 from ceph/wip-8586
rgw: fix crash in swift CORS preflight request

Reviewed-by: Sage Weil <sage@redhat.com>
2014-07-30 20:57:06 -07:00
Sage Weil
9df9d28009 mon/OSDMonitor: fix i386 floating point rounding error
This would round .123 to .122999 on i386; now it does not.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-30 17:50:39 -07:00
Josh Durgin
9eda0bbe1c Merge pull request #2171 from ceph/wip-cli-integration
fix rbd cli-integratoin tests

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-07-30 16:57:38 -07:00
Sage Weil
96863128e6 atomic: fix read() on i386, clean up types
Among other things, fixes #8969

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-30 14:52:06 -07:00
Sage Weil
605064dc68 test/cli-integration/rbd: fix trailing space
Newer versions of json.tool remove the trailing ' ' after the comma.  Add
it back in with sed so that the .t works on both old and new versions, and
so that we don't have to remove the trailing spaces from all of the test
cases.

Backport: firefly
Fixes: #8920
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-30 13:41:16 -07:00
Sage Weil
6e6fc23c7e v0.83
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJT2AdNAAoJEH6/3V0X7TFt+5EP/iLOUg5o6aqBa/7yUNwtgZEb
 6cm1h8bWJpigP51oHGNyoeS4PnYWQ7DfvwKL/TDP8268g/o/w0DRvSnCZopHFos9
 j6Ci/VE9ag9uQNqW+NOph13k3fjf5KetzM5g/q/Ay4dKVCS2+9uABfosql9RNZa6
 ojhGKf2BtMgswfemq/0XWc49Ptimox5G/ntR+/xYm0s906q5wB1Y9Tvh2PNZo1Y1
 wL2qy9UnmonBLGIu0BIStKnub57VHCYbNqV6fl3W+Oct9f0znYPCqnRVUb2lw3Ie
 4KciilzteQCfurCCI7CQFmNEKCVpPlujiKo/q8CKIDgbwkMcUntCmW9QcmH3BzC5
 czYr695aokE+dt+MICRY+sIREY5achXynb7wnSon9JI8qrCUQ0o4fHQ1AZOio7V6
 +zcCdussqSeEXOoVUlNS5eGrzbY1kqrFcXY18WiCy6nadLapuUQTtJ5QALQyJ5TW
 8TidkkU6h0V4sworwpM6tiDLfq2UQwZ5NuP8MGz9DtOjMDbLHSE6TrRug7Irjj41
 4AKdkSWMhuXljm/rEsOi54ZGRUhq2VZ2xpnUD0WR8r/3lAP1d2UnefFlrSZaCN4z
 bNcrCncK7wre2UUyDQ/qJ+S808XPUPQaohbmb3Eg+Hr0mbkiJXYdNNyrUzL3wnkr
 E3YL+8sapzZKn9zOxNQ3
 =ujRc
 -----END PGP SIGNATURE-----

Merge tag 'v0.83'

v0.83
2014-07-29 16:23:12 -07:00
John Spray
440c820cce Merge pull request #2161 from ceph/wip-jcsp-test
Reviewed-by: Greg Farnum greg@inktank.com
2014-07-29 23:55:30 +01:00
Yehuda Sadeh
18ea2a8697 rgw: fix crash in swift CORS preflight request
Fixes: #8586

This fixes error handling, in accordance with commit 6af5a537 that fixed
the same issue for the S3 case.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2014-07-29 15:33:03 -07:00
John Spray
6bb3aeafcf mds: remove some rogue "using namespace std;"
Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-29 22:32:43 +01:00
John Spray
c283ad4ba5 mds: handle replaying old format journals
To get back to the reformatting procedure that otherwise
occurs during MDLog::open, introduce an MDLog::reopen call
that MDS can use in the standbyreplay->standby transition
for the special case where the journal is old.

Fixes: #8869

Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-29 22:32:43 +01:00
John Spray
07665ec4b3 mds: introduce explicit DaemonState instead of int
Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-29 22:32:43 +01:00
John Spray
6b004f19da mds: refactor MDS boot
* Make boot_start private.
* Define boot stages in enum, replace int with type.
* Merge steps 0 and 1, 0 always fell through to 1.
* starting_done was only ever reached by a fall through
  from the previous step, so call it directly from there.

Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-29 22:32:18 +01:00
John Spray
6832ec041a mds: make MDS::replay_done clearer
... and add some assertions.

Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-29 22:32:05 +01:00
John Spray
e587088918 mds: remove unused purge_prealloc_ino
Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-29 22:32:05 +01:00
John Spray
6be80873c3 mds: separate inode recovery queue from MDCache
Refactor to:
* have somewhere to put some logic for doing
  background recovery in future.
* trim a few lines from the oversized MDCache.cc
  whereever we can.

Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-29 22:32:05 +01:00
Sandon Van Ness
0d70989a89 python-ceph: require libcephfs.
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-29 14:11:03 -07:00
Jenkins
78ff1f0a5d 0.83 2014-07-29 13:42:53 -07:00
Gregory Farnum
aa5f21cea0 Merge pull request #2159 from ceph/wip-undump
tools/cephfs: fuller header in dump/undump

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-07-29 16:40:31 -04:00
Sandon Van Ness
06c473610f Remove reference from mkcephfs.
A bit of colission from spec changes for the rhel7/ceph-common
changes and alfredo's pull request for wip-die-ceph-mkcephfs.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
(cherry picked from commit 1526546ddc)
2014-07-29 16:27:33 -04:00
Gregory Farnum
54330a0a09 Merge pull request #2156 from ceph/wip-upstart-nfile
upstart/ceph-osd.conf: bump nofile limit up by 10x

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-07-29 15:36:19 -04:00
Sage Weil
4045b2e837 doc/release-notes: typo
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-29 12:33:52 -07:00
Sage Weil
df1bad8f7e doc/release-notes: v0.80.5 release notes
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-29 12:23:33 -07:00
Sage Weil
9461d8e6ad Merge remote-tracking branch 'gh/next' 2014-07-29 11:16:24 -07:00
Greg Farnum
a949a55b1f Merge branch 'origin/wip-osd-leaks'
Reviewed-by: Greg Farnum <greg@inktank.com>
2014-07-29 10:34:46 -07:00
Gregory Farnum
0bd4c86238 Merge pull request #2139 from ceph/wip-journal-header
os/FileJournal: Update the journal header when closing journal

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-07-29 09:04:12 -04:00
Gregory Farnum
37eba045ec Merge pull request #2146 from ceph/wip-8932
ceph_test_rados_api_tier: do fewer writes in HitSetWrite

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-07-29 09:01:41 -04:00
Gregory Farnum
050ac87530 Merge pull request #2147 from ceph/wip-8931
osd: fix ops blocked by full cache tier dequeue

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-07-29 08:58:30 -04:00
Sage Weil
f36cffc986 unittest_crush_wrapper: fix build
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-28 17:18:56 -07:00
Dan Mick
7f913dcd52 Merge pull request #2150 from ceph/wip-libs
don't link everything with blkid, udev, and boost_threads
2014-07-28 17:06:41 -07:00
Josh Durgin
79c631668f Merge pull request #2153 from ceph/wip-fsx-overlap
librbd API fix + wip-fsx-overlap

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-07-28 14:30:51 -07:00
Sage Weil
7f12a0f4c6 Merge pull request #2152 from xiaoxichen/fix_ceph_df
PGMonitor: fix bug in caculating pool avail space

Reviewed-by: Sage Weil <sage@redhat.com>
2014-07-28 11:41:09 -07:00
Sandon Van Ness
1526546ddc Remove reference from mkcephfs.
A bit of colission from spec changes for the rhel7/ceph-common
changes and alfredo's pull request for wip-die-ceph-mkcephfs.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-28 10:38:41 -07:00
Xiaoxi Chen
9b03752203 Fix some style and checking issue
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2014-07-29 00:42:10 +08:00
Sage Weil
5773a374d0 upstart/ceph-osd.conf: bump nofile limit up by 10x
This should ensure that we don't hit this limit on all but the very biggest
clusters.  We seen it hit on a ~500 OSD dumpling cluster.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-28 09:27:20 -07:00
Sage Weil
cb20b99641 Merge pull request #2154 from simon3z/master
init: add systemd service files

Reviewed-by: Alfredo Deza <alfredo.deza@inktank.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2014-07-28 09:22:47 -07:00
John Spray
d3e5961d37 tools/cephfs: fuller header in dump/undump
There were two problems here:
 * write_pos was modified through an undump/dump cycle,
   because it was probed during recovery.
 * stream format was being forgotten.

Signed-off-by: John Spray <john.spray@redhat.com>
2014-07-28 15:50:49 +01:00
Ilya Dryomov
e183a4d989 test_librbd_fsx: clone/flatten probabilities
Higher the clone probability to 8% and lower the probability of flatten
to 2%.  This should give us longer parent chaines (before this we would
usually have one parent and even then only for a few ops time).

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-07-28 13:53:54 +04:00
Ilya Dryomov
bb095ffdbf test_librbd_fsx: randomize_parent_overlap
Truncate base images after they have been cloned from to cover more
code paths and make sure that clients look at snapshot parent_overlap
(i.e. parent_overlap of the base image at the time the snapshot was
taken) and not that of the base image (i.e. parent_overlap of the base
image as of now).

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-07-28 13:53:54 +04:00
Ilya Dryomov
f6d1a920fd test_librbd_fsx: introduce rbd_image_has_parent()
A helper to check whether the image associated with the ctx has
a parent or not.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-07-28 13:53:54 +04:00
Ilya Dryomov
eb697dd9ee librbd: make rbd_get_parent_info() accept NULL out params
The C++ version of rbd_get_parent_info() allows passing NULL for parent
image name, image name and snapshot name out parameters.  Make C API do
the same both for consistency and to make it easier to check whether
the image at hand has a parent or not.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-07-28 13:53:54 +04:00
Xiaoxi Chen
04d0526718 PGMonitor: fix bug in caculating pool avail space
Currently for pools with different rules, "ceph df" cannot report
right available space for them, respectively. For detail assisment
of the bug ,pls refer to bug report #8943

This patch fix this bug and make ceph df works correctlly.

Fixes Bug #8943

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2014-07-28 17:47:51 +08:00
Sage Weil
3695b255ae Merge pull request #2149 from yuyuyu101/wip-flush-set
Fix dup bh_write for TX state bh

Tested-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>

Original changeset 

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-07-27 19:39:34 -07:00
Sage Weil
b08470f0bf configure.ac: link libboost_thread only with json-spirit
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-27 16:58:08 -07:00