]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agomount.ceph: avoid spurious error message 3286/head
Yan, Zheng [Sat, 3 Jan 2015 07:29:29 +0000 (15:29 +0800)]
mount.ceph: avoid spurious error message

/etc/mtab in most modern distributions is a symbol link to
/proc/self/mounts.

Fixes: #10351
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3284 from ktdreyer/doc-rados-preflight-os
Loic Dachary [Fri, 2 Jan 2015 17:54:47 +0000 (18:54 +0100)]
Merge pull request #3284 from ktdreyer/doc-rados-preflight-os

doc: rm reference to old Ubuntu release

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: rm reference to old Ubuntu release 3284/head
Ken Dreyer [Fri, 2 Jan 2015 17:32:26 +0000 (10:32 -0700)]
doc: rm reference to old Ubuntu release

Remove the reference to "Ubuntu 12.10" since this is EOL.

Clarify that we only recommend Ubuntu LTS releases.

(Since this information has a tendancy to become stale, perhaps this
whole paragraph should be removed here and we should simply point at the
main OS Recommendations page.)

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #3223 from objoo/master
Loic Dachary [Thu, 1 Jan 2015 21:52:24 +0000 (22:52 +0100)]
Merge pull request #3223 from objoo/master

mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomsg: fix factory error message
Sage Weil [Tue, 30 Dec 2014 22:08:49 +0000 (14:08 -0800)]
msg: fix factory error message

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agounittest_msgr: enable experiemntal async msgr
Sage Weil [Tue, 30 Dec 2014 22:08:38 +0000 (14:08 -0800)]
unittest_msgr: enable experiemntal async msgr

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3219 from yuyuyu101/wip-10383
Sage Weil [Tue, 30 Dec 2014 18:46:58 +0000 (10:46 -0800)]
Merge pull request #3219 from yuyuyu101/wip-10383

Wip 10383: Fix unittest_msgr with AsyncMessenger bug

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3279 from ceph/wip-mon-janitorial-list
Sage Weil [Tue, 30 Dec 2014 18:44:17 +0000 (10:44 -0800)]
Merge pull request #3279 from ceph/wip-mon-janitorial-list

src/doc: add monitor janitorial list

10 years agoMerge pull request #3278 from mslovy/wip-y04
Haomai Wang [Tue, 30 Dec 2014 12:30:34 +0000 (20:30 +0800)]
Merge pull request #3278 from mslovy/wip-y04

KeyValueStore:: do_transactions: clean up code which is never used

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoKeyValueStore:: do_transactions: clean up code which is never used 3278/head
Ning Yao [Tue, 30 Dec 2014 10:53:21 +0000 (10:53 +0000)]
KeyValueStore:: do_transactions: clean up code which is never used
clean up ops and bytes which is never used in do_transactions()

Signed-off-by: Ning Yao <zay11022@gmail.com>
10 years agosrc/doc: add monitor janitorial list 3279/head
Joao Eduardo Luis [Tue, 30 Dec 2014 10:08:45 +0000 (10:08 +0000)]
src/doc: add monitor janitorial list

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3274 from ceph/wip-10341
Sage Weil [Tue, 30 Dec 2014 00:28:57 +0000 (16:28 -0800)]
Merge pull request #3274 from ceph/wip-10341

tools: ceph-monstore-tool: refactor cli parsing

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3275 from liewegas/wip-experimental
Sage Weil [Mon, 29 Dec 2014 22:22:17 +0000 (14:22 -0800)]
Merge pull request #3275 from liewegas/wip-experimental

mark some features experimental and warn accordingly

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocommon: log which experimental features are enabled. 3275/head
Sage Weil [Mon, 29 Dec 2014 20:11:18 +0000 (12:11 -0800)]
common: log which experimental features are enabled.

This will appear in the logs regardless of whether or not the features
get used/enabled via other config options.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoms: mark async messenger experimental
Sage Weil [Mon, 29 Dec 2014 19:37:59 +0000 (11:37 -0800)]
ms: mark async messenger experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos: rename keyvaluestore-dev -> keyvaluestore; mark experimental
Sage Weil [Mon, 29 Dec 2014 19:36:36 +0000 (11:36 -0800)]
os: rename keyvaluestore-dev -> keyvaluestore; mark experimental

Use a clean name for keyvaluestore (no -dev suffix), but mark as
experimental to ensure users know what they are signing up for.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon: add 'enable experimental data corrupting features'
Sage Weil [Mon, 29 Dec 2014 19:33:00 +0000 (11:33 -0800)]
common: add 'enable experimental data corrupting features'

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3265 from yuyuyu101/coverify-fix
Sage Weil [Mon, 29 Dec 2014 18:56:23 +0000 (10:56 -0800)]
Merge pull request #3265 from yuyuyu101/coverify-fix

Event: Avoid illegal multiplication for memset

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3260 from nilamdyuti/wip-doc-ceph-object-gateway
John Wilkins [Mon, 29 Dec 2014 18:39:24 +0000 (10:39 -0800)]
Merge pull request #3260 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Updates information for SSL configuration in Ceph Object Gateway installation.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
10 years agotools: ceph-monstore-tool: validate start/stop vals 3274/head
Joao Eduardo Luis [Mon, 29 Dec 2014 17:25:58 +0000 (17:25 +0000)]
tools: ceph-monstore-tool: validate start/stop vals

on commands that use 'start' and 'stop'/'end' values, we should validate
them and inform the user when 'stop' > 'start'.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: output number of paxos versions dumped
Joao Eduardo Luis [Mon, 29 Dec 2014 17:10:32 +0000 (17:10 +0000)]
tools: ceph-monstore-tool: output number of paxos versions dumped

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: raw map to stdout if outfile not specified
Joao Eduardo Luis [Mon, 29 Dec 2014 17:09:20 +0000 (17:09 +0000)]
tools: ceph-monstore-tool: raw map to stdout if outfile not specified

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: use subcmd parser helper
Joao Eduardo Luis [Mon, 29 Dec 2014 17:08:10 +0000 (17:08 +0000)]
tools: ceph-monstore-tool: use subcmd parser helper

reduces the noise in the code

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph_monstore_tool: add sub-command parser helper function
Joao Eduardo Luis [Mon, 29 Dec 2014 16:16:07 +0000 (16:16 +0000)]
tools: ceph_monstore_tool: add sub-command parser helper function

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: a cli that works
Joao Eduardo Luis [Wed, 24 Dec 2014 02:02:32 +0000 (02:02 +0000)]
tools: ceph-monstore-tool: a cli that works

Fixes: #10341
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoEvent: Avoid illegal multiplication for memset 3265/head
Haomai Wang [Sun, 28 Dec 2014 13:31:35 +0000 (21:31 +0800)]
Event: Avoid illegal multiplication for memset

Because "file_events" is "FileEvent" type and adding an integral value to
this pointer automatically scales that value by the size.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agomailmap: Chris Holcombe affiliation 3223/head
Yann Dupont [Fri, 19 Dec 2014 22:28:33 +0000 (23:28 +0100)]
mailmap: Chris Holcombe affiliation

10 years agomailmap: Alfredo Deza affiliation : Fix Typo.
Yann Dupont [Fri, 19 Dec 2014 23:18:39 +0000 (00:18 +0100)]
mailmap: Alfredo Deza affiliation : Fix Typo.

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Christos Stavrakakis affiliation
Yann Dupont [Fri, 19 Dec 2014 22:35:10 +0000 (23:35 +0100)]
mailmap: Christos Stavrakakis affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Ning Yao affiliation
Yann Dupont [Fri, 19 Dec 2014 22:31:56 +0000 (23:31 +0100)]
mailmap: Ning Yao affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Shishir Gowda affiliation
Yann Dupont [Fri, 19 Dec 2014 22:25:12 +0000 (23:25 +0100)]
mailmap: Shishir Gowda affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: David Anderson affiliation
Yann Dupont [Fri, 19 Dec 2014 22:22:32 +0000 (23:22 +0100)]
mailmap: David Anderson affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Matt Benjamin affiliation
Yann Dupont [Fri, 19 Dec 2014 21:31:33 +0000 (22:31 +0100)]
mailmap: Matt Benjamin affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Yunchuan Wen affiliation
Yann Dupont [Fri, 19 Dec 2014 21:15:27 +0000 (22:15 +0100)]
mailmap: Yunchuan Wen affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agoMerge pull request #3255 from tchaikov/async-leak
Haomai Wang [Fri, 26 Dec 2014 14:42:33 +0000 (22:42 +0800)]
Merge pull request #3255 from tchaikov/async-leak

AsyncMessenger: fix the leak of file_events

10 years agodoc: Updates information for SSL configuration in Ceph Object Gateway installation. 3260/head
Nilamdyuti Goswami [Fri, 26 Dec 2014 14:28:57 +0000 (19:58 +0530)]
doc: Updates information for SSL configuration in Ceph Object Gateway installation.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoAsyncMessenger: reset newly allocated file_events 3255/head
Kefu Chai [Fri, 26 Dec 2014 08:28:22 +0000 (16:28 +0800)]
AsyncMessenger: reset newly allocated file_events

* otherwise there is chance that Event could take them as already
  initialized ones even they are filled with random bits from heap.

10 years agoMerge pull request #3257 from mslovy/wip-y02
Sage Weil [Fri, 26 Dec 2014 04:52:06 +0000 (20:52 -0800)]
Merge pull request #3257 from mslovy/wip-y02

PG:: filter_snapc: Return immediately if no snapc need to trim

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3256 from majianpeng/fix4
Sage Weil [Fri, 26 Dec 2014 04:48:40 +0000 (20:48 -0800)]
Merge pull request #3256 from majianpeng/fix4

FileJournal: Don't cache journal data if journal w/o directio mode

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoPG:: filter_snapc: Return immediately if no snapc need to trim 3257/head
Ning Yao [Fri, 26 Dec 2014 04:20:35 +0000 (04:20 +0000)]
PG:: filter_snapc: Return immediately if no snapc need to trim
we can return immediately if no snapc need to trim. Do not iterater snapc vector and do extra judgement and ops.

Signed-off-by: Ning Yao <zay11022@gmail.com>
10 years agoFileJournal: Don't cache journal data if journal w/o directio mode 3256/head
Jianpeng Ma [Fri, 26 Dec 2014 01:58:24 +0000 (09:58 +0800)]
FileJournal: Don't cache journal data if journal w/o directio mode

Only read journal data in osd starting.So no need to keep journal
data in kernel cache/buffer.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoAsyncMessenger: fix the leak of file_events
Kefu Chai [Thu, 25 Dec 2014 13:44:53 +0000 (21:44 +0800)]
AsyncMessenger: fix the leak of file_events

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agoMerge pull request #3241 from ceph/wip-10415
Sage Weil [Tue, 23 Dec 2014 16:17:34 +0000 (08:17 -0800)]
Merge pull request #3241 from ceph/wip-10415

libcephfs/test.cc: close fd before umount

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3245 from trociny/fix-10132
Sage Weil [Tue, 23 Dec 2014 16:13:35 +0000 (08:13 -0800)]
Merge pull request #3245 from trociny/fix-10132

10132: osd: tries to set ioprio when the config option is blank

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoAsyncMessenger: Fix leak memory 3219/head
Haomai Wang [Tue, 23 Dec 2014 12:27:05 +0000 (20:27 +0800)]
AsyncMessenger: Fix leak memory

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years ago10132: osd: tries to set ioprio when the config option is blank 3245/head
Mykola Golub [Tue, 23 Dec 2014 11:39:33 +0000 (13:39 +0200)]
10132: osd: tries to set ioprio when the config option is blank

According to documentation, ioprio params will only be used if both
osd disk thread ioprio class and osd disk thread ioprio priority are
set to a non default value.

So, add a proper check and do not generate "set_disk_tp_priority(22)
Invalid argument" warning for the default settings.

10 years agoMakefile: Restore check
Haomai Wang [Fri, 19 Dec 2014 18:16:57 +0000 (02:16 +0800)]
Makefile: Restore check

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection: Init peer_global_seq
Haomai Wang [Fri, 19 Dec 2014 14:41:48 +0000 (22:41 +0800)]
AsyncConnection: Init peer_global_seq

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest_msgr: Avoid deadlock between send_message and dispatch
Haomai Wang [Fri, 19 Dec 2014 14:28:54 +0000 (22:28 +0800)]
test_msgr: Avoid deadlock between send_message and dispatch

If connection holds Connection's lock and try to acquire
FakeDispatcher's lock while gtest thread try to send_message with
FakeDispatcher's lock and try to acquire Connection's lock,
it will be deadlock.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncMessenger: Make learn_addr async to avoid destroying lock rule
Haomai Wang [Fri, 19 Dec 2014 14:25:58 +0000 (22:25 +0800)]
AsyncMessenger: Make learn_addr async to avoid destroying lock rule

Make learn_addr become a async op, otherwise holding connection's
lock then acquire messenger's lock will destroy lock rule.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection:: Avoid getting stopping connection
Haomai Wang [Fri, 19 Dec 2014 14:13:31 +0000 (22:13 +0800)]
AsyncConnection:: Avoid getting stopping connection

Now AsyncConnection::_stop may consume a little time on deleting time events,
it may occur that accepting a connection get this stopping connection
because unregister call isn't met.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection: Ensure reply connect_seq larger than sent
Haomai Wang [Fri, 19 Dec 2014 14:07:13 +0000 (22:07 +0800)]
AsyncConnection: Ensure reply connect_seq larger than sent

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #3243 from yuyuyu101/wip-10424
Loic Dachary [Tue, 23 Dec 2014 11:12:12 +0000 (12:12 +0100)]
Merge pull request #3243 from yuyuyu101/wip-10424

librados: only call watch_flush if necessary

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agolibrados: only call watch_flush if necessary 3243/head
Haomai Wang [Tue, 23 Dec 2014 10:38:24 +0000 (18:38 +0800)]
librados: only call watch_flush if necessary

Fix bug #10424
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibcephfs/test.cc: close fd before umount 3241/head
Yan, Zheng [Tue, 23 Dec 2014 02:22:00 +0000 (10:22 +0800)]
libcephfs/test.cc: close fd before umount

Fixes: #10415
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3200 from boydc2014/master
Loic Dachary [Mon, 22 Dec 2014 23:56:17 +0000 (00:56 +0100)]
Merge pull request #3200 from boydc2014/master

fix unmatched op code

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3222 from ceph/wip-watch-notify-2
Sage Weil [Mon, 22 Dec 2014 21:57:52 +0000 (13:57 -0800)]
Merge pull request #3222 from ceph/wip-watch-notify-2

librados: fix watch/notify event flushing

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados: warn about rados_watch_flush() prior to ioctx shutdown 3222/head
Sage Weil [Mon, 22 Dec 2014 21:56:07 +0000 (13:56 -0800)]
librados: warn about rados_watch_flush() prior to ioctx shutdown

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3114 from xiaoxichen/drop_incorrect_pool
Samuel Just [Mon, 22 Dec 2014 19:41:16 +0000 (11:41 -0800)]
Merge pull request #3114 from xiaoxichen/drop_incorrect_pool

Cleanup: Drop hobject_incorrect_pool

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3138 from ceph/wip-10029
Samuel Just [Mon, 22 Dec 2014 19:40:22 +0000 (11:40 -0800)]
Merge pull request #3138 from ceph/wip-10029

SimpleMessenger: Retry binding on addresses if binding fails

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3239 from ceph/wip-stop.sh-me
John Spray [Mon, 22 Dec 2014 19:23:41 +0000 (19:23 +0000)]
Merge pull request #3239 from ceph/wip-stop.sh-me

stop.sh: killall -u takes username, not uid

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agostop.sh: killall -u takes username, not uid 3239/head
Dan Mick [Mon, 22 Dec 2014 19:17:56 +0000 (11:17 -0800)]
stop.sh: killall -u takes username, not uid

Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agoMerge pull request #3183 from ceph/wip-10262
Samuel Just [Mon, 22 Dec 2014 18:16:58 +0000 (10:16 -0800)]
Merge pull request #3183 from ceph/wip-10262

osd: fix handling of create+delete transaction

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3238 from ceph/wip-10414
Gregory Farnum [Mon, 22 Dec 2014 18:00:18 +0000 (10:00 -0800)]
Merge pull request #3238 from ceph/wip-10414

client: fix uninitialized member

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoclient: fix uninitialized member 3238/head
John Spray [Mon, 22 Dec 2014 17:57:57 +0000 (17:57 +0000)]
client: fix uninitialized member

Fixes: #10414
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3237 from dachary/wip-10408-something-is-better-than-nothing
Sage Weil [Mon, 22 Dec 2014 16:21:42 +0000 (08:21 -0800)]
Merge pull request #3237 from dachary/wip-10408-something-is-better-than-nothing

osd: be_compare_scrubmaps uses incorrect j iterator

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3236 from ceph/wip-10409
Sage Weil [Mon, 22 Dec 2014 16:21:06 +0000 (08:21 -0800)]
Merge pull request #3236 from ceph/wip-10409

osd: fix 10409 (object checksums for ec backends)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: be_compare_scrubmaps uses incorrect j iterator 3237/head
Loic Dachary [Mon, 22 Dec 2014 16:05:50 +0000 (17:05 +0100)]
osd: be_compare_scrubmaps uses incorrect j iterator

The code moved from be_select_auth_object to be_compare_scrubmaps
74bd8708dfbfd3c8e7ba3f41d8534609dcbc1237 but the j iterator is use
differently although it has the same type. Use map.begin() as a
fallback instead.

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

Signed-off-by: Loic Dachary <ldachary@dachary.org>
10 years agoosd: scrub: only assume shard digest == oi digest for replicated pools 3236/head
Sage Weil [Mon, 22 Dec 2014 15:32:36 +0000 (07:32 -0800)]
osd: scrub: only assume shard digest == oi digest for replicated pools

For an EC object, the digest we get from scrub is for the *shard*, and that
is not the same as the *object* digest in the object_info_t.  Skip these
checks; we already have the per-shard digest that is verified in the EC
backend.

Fixes: #10409
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: clean up use of hex for digests
Sage Weil [Mon, 22 Dec 2014 15:27:10 +0000 (07:27 -0800)]
osd: clean up use of hex for digests

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/ECBackend: use correct seed for (empty) omap digest
Sage Weil [Mon, 22 Dec 2014 15:12:44 +0000 (07:12 -0800)]
osd/ECBackend: use correct seed for (empty) omap digest

This will be 0 on mixed OSD version PGs, -1 on current PGs.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge branch 'wip-10409-removed-object' of git://github.com/dachary/ceph
Sage Weil [Mon, 22 Dec 2014 14:58:19 +0000 (06:58 -0800)]
Merge branch 'wip-10409-removed-object' of git://github.com/dachary/ceph

10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Mon, 22 Dec 2014 14:51:14 +0000 (06:51 -0800)]
Merge remote-tracking branch 'gh/next'

Conflicts:
PendingReleaseNotes

10 years agoMerge pull request #3230 from ceph/wip-pg-stat
Sage Weil [Mon, 22 Dec 2014 14:46:21 +0000 (06:46 -0800)]
Merge pull request #3230 from ceph/wip-pg-stat

mon/PGMap: restructure 'pg stat' formatted output

Reviewed-by: John Spray <jspray@redhat.com>
10 years agomon/PGMap: restructure 'pg stat' formatted output 3230/head
Sage Weil [Mon, 22 Dec 2014 14:41:25 +0000 (06:41 -0800)]
mon/PGMap: restructure 'pg stat' formatted output

The + character, which appears in state names, is not a valid XML token.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3235 from dachary/wip-10410-port-7110
Sage Weil [Mon, 22 Dec 2014 14:39:20 +0000 (06:39 -0800)]
Merge pull request #3235 from dachary/wip-10410-port-7110

tests: use port 7111 for osd-copy-from.sh

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3234 from majianpeng/bug-fix
Sage Weil [Mon, 22 Dec 2014 14:38:30 +0000 (06:38 -0800)]
Merge pull request #3234 from majianpeng/bug-fix

objectstore: add fadvise_flags operations in ObjectStore::Transaction::append func.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoremove unmatched op code comparasion 3200/head
Lei Dong [Mon, 22 Dec 2014 13:33:34 +0000 (21:33 +0800)]
remove unmatched op code comparasion

Signed-off-by: Dong Lei <leidong@yahoo-inc.com>
10 years agotests: use port 7111 for osd-copy-from.sh 3235/head
Loic Dachary [Mon, 22 Dec 2014 13:20:58 +0000 (14:20 +0100)]
tests: use port 7111 for osd-copy-from.sh

Because port 7110 is already used by mkfs.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: recovery of a lost object in erasure coded pools 3233/head
Loic Dachary [Mon, 22 Dec 2014 11:34:19 +0000 (12:34 +0100)]
tests: recovery of a lost object in erasure coded pools

http://tracker.ceph.com/issues/10409 Refs: #10409

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoobjectstore: add fadvise_flags operations in 3234/head
Jianpeng Ma [Mon, 22 Dec 2014 12:50:50 +0000 (20:50 +0800)]
objectstore: add fadvise_flags operations in
ObjectStore::Transaction::append func.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agotests: remove spurious lines from osd-scrub-repair.sh
Loic Dachary [Mon, 22 Dec 2014 11:29:10 +0000 (12:29 +0100)]
tests: remove spurious lines from osd-scrub-repair.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3228 from dachary/wip-10401-docker-install-deps
Sage Weil [Sun, 21 Dec 2014 23:51:34 +0000 (15:51 -0800)]
Merge pull request #3228 from dachary/wip-10401-docker-install-deps

tests: oneliner to run make check in a container

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3231 from ceph/wip-mon-health
Loic Dachary [Sun, 21 Dec 2014 23:35:44 +0000 (00:35 +0100)]
Merge pull request #3231 from ceph/wip-mon-health

mon: make 'ceph -s' show pg state counts in reverse descending order

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: reduce centos docker intermediate steps 3228/head
Loic Dachary [Sun, 21 Dec 2014 16:51:05 +0000 (17:51 +0100)]
tests: reduce centos docker intermediate steps

Collapse multiple RUN statements related to systemd into a single line
to reduce the number of steps that are preserved by docker.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: add docker-test.sh --ref giant|firefly etc.
Loic Dachary [Sun, 21 Dec 2014 14:19:08 +0000 (15:19 +0100)]
tests: add docker-test.sh --ref giant|firefly etc.

Add the --ref option to chose the git ref to which the working tree must
be reset instead of HEAD.

   test/docker-test.sh --ref giant make

is equivalent to

   test/docker-test.sh bash -c 'git reset --hard giant ; make'

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: avoid bash == --shell confusion in docker-test-helper.sh
Loic Dachary [Sun, 21 Dec 2014 13:22:31 +0000 (14:22 +0100)]
tests: avoid bash == --shell confusion in docker-test-helper.sh

Do not force interactive mode when the bash script is specified by the
user because it should be usable to run a small script instead of
starting an interactive shell session.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: add xmlstarlet in containers
Loic Dachary [Sun, 21 Dec 2014 09:58:39 +0000 (10:58 +0100)]
tests: add xmlstarlet in containers

It can be removed once https://github.com/ceph/ceph/pull/3228 is merged
and xmlstarlet is found in ceph.spec.in and debian/control.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: helpers to run make check in containers
Loic Dachary [Sun, 21 Dec 2014 09:01:59 +0000 (10:01 +0100)]
tests: helpers to run make check in containers

Add scripts that run make check in a container for a given operating
system version. They are a little more than oneliners and serve two
purposes:

  * help new developers who do not have to figure out which options
    should be used

  * run make check in containers in parallel with make -j2

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: run-make-check.sh arguments are passed to configure
Loic Dachary [Sun, 21 Dec 2014 08:47:57 +0000 (09:47 +0100)]
tests: run-make-check.sh arguments are passed to configure

All run-make-check.sh arguments are transparently given to the configure
command. For instance:

    run-make-check.sh --enable-root-make-check

implies

    ./configure --enable-root-make-check

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: replace --enable-docker with --enable-root-make-check
Loic Dachary [Sun, 21 Dec 2014 08:39:01 +0000 (09:39 +0100)]
tests: replace --enable-docker with --enable-root-make-check

The --enable-docker logic was that each test that needs privileges to
run uses a container to do so. The problem with this approach and
make -j8 check is that such tests compete for a single container.

The --enable-root-make-check activates tests that require privileges and
assume it is ok to use sudo to acquire privileges. The decision to run
in a container is then taken by the caller who will run something like:

   docker-tests.sh ./configure --enable-root-make-check
   docker-tests.sh make -j8 check

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: docker-test.sh commands are relative to git root
Loic Dachary [Sun, 21 Dec 2014 08:33:46 +0000 (09:33 +0100)]
tests: docker-test.sh commands are relative to git root

Instead of being in the src directory. Forcing the working directory to
src is convenient to run unittests individually without the need to
change directory, but it is confusing to the user.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: deprecate docker-test.sh --compile option
Loic Dachary [Sun, 21 Dec 2014 08:24:54 +0000 (09:24 +0100)]
tests: deprecate docker-test.sh --compile option

It is redundant with the run-make-check.sh script and imposes additional
limitations.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: enable password-less sudo in containers
Loic Dachary [Sun, 21 Dec 2014 08:21:59 +0000 (09:21 +0100)]
tests: enable password-less sudo in containers

If compilation is run with ./configuire --enable-root-make-check, sudo
is expected to work without human interaction.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph.spec.in or debian/control rebuild docker images
Loic Dachary [Sat, 20 Dec 2014 22:28:28 +0000 (23:28 +0100)]
tests: ceph.spec.in or debian/control rebuild docker images

If any of the files in test/$os_type is newer than the creation date of
a docker image, the image is removed and rebuilt from scratch. For
instance, when a package is added to debian/control, the debian based
images are rebuilt.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: docker images must use install-deps.sh
Loic Dachary [Sat, 20 Dec 2014 17:20:58 +0000 (18:20 +0100)]
tests: docker images must use install-deps.sh

The dockerfiles must run install-deps.sh instead of duplicating the
package list that is found in ceph.spec.in and debian/control.

A directory is created for each os_type and provided as a context for
docker build to use. The former $os_type.dockerfile is moved into
$os_type/Dockerfile.in (the .in as a reminder that it will be variable
substituted).

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: run-make-check.sh install jq
Loic Dachary [Sat, 20 Dec 2014 18:30:59 +0000 (19:30 +0100)]
tests: run-make-check.sh install jq

jq is useful to parse json from the command line. It is however not
packaged for all supported distributions (precise has it in the backport
repository which is usually not active) and cannot be conveniently added
to debian/control because it targets all distributions and has no
conditionals.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoinstall-deps.sh: do not require sudo when root
Loic Dachary [Sat, 20 Dec 2014 17:57:59 +0000 (18:57 +0100)]
install-deps.sh: do not require sudo when root

If the user is root, do not use sudo. The sudo package is not installed
by default on centos by default and when building from script it may be
that root is running install-deps.sh on a freshly install distribution.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3134 from ceph/wip-9059-checksums
Sage Weil [Sun, 21 Dec 2014 16:06:44 +0000 (08:06 -0800)]
Merge pull request #3134 from ceph/wip-9059-checksums

osd: record and validate whole-object checksums during deep scrub

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agomon: make 'ceph -s' show pg state counts in reverse descending order 3231/head
Sage Weil [Sun, 21 Dec 2014 15:43:57 +0000 (07:43 -0800)]
mon: make 'ceph -s' show pg state counts in reverse descending order

Because these are in an unordered_map we print this is random order.
Instead sort descending by count.

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