Samuel Just
52d1797b92
Merge pull request #4365 from ceph/wip-digest-repair
...
osd: fix repair when recorded digest is wrong
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-11 10:41:13 -07:00
Samuel Just
4c65d6660e
Merge pull request #4252 from wonzhq/make_writeable
...
osd: fixes for make_writeable
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-11 10:38:24 -07:00
Samuel Just
61387b2a82
Merge pull request #4450 from big-henry/wip-journal
...
FileJournal: fix check_for_full
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-11 10:37:51 -07:00
Samuel Just
8685fab253
Merge pull request #4293 from ajs1984/master
...
librados: Add config observer for Objecter instance.
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-11 10:35:17 -07:00
Samuel Just
e7abe87c96
Merge pull request #4352 from majianpeng/misc-fix
...
Misc fix
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-05-11 10:34:53 -07:00
Samuel Just
05db2b0a25
Merge pull request #4452 from tchaikov/wip-interactive-ceph-cli
...
Wip interactive ceph cli
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-11 10:29:40 -07:00
Samuel Just
f14663807f
Merge pull request #4494 from ceph/wip-int-option-overflow
...
Wip int option overflow
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-11 10:27:55 -07:00
Joao Eduardo Luis
354fcabdb9
Merge pull request #4645 from ceph/wip-fix-BTBFS-message-monmetadata
...
mon: fix the FTBFS
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-05-11 17:23:52 +01:00
Kefu Chai
3699a73269
mon: fix the FTBFS
...
put the messages/MMonMetadata.h into the dist tarball.
Fixes : #10904
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-11 08:54:50 -07:00
Ken Dreyer
d294deb10e
Merge pull request #4626 from trhoden/bootstrap-rgw
...
debian: add bootstrap-rgw dir to ceph package
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-05-11 09:38:04 -06:00
Ken Dreyer
73daa84b68
Merge pull request #4609 from trhoden/ceph-spec-rgw
...
Add rgw placeholder directories to ceph-radosgw package
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-11 09:18:52 -06:00
Kefu Chai
87f37b6b1a
Merge pull request #4227 from tchaikov/node-ls
...
mon,osd,mds: add "{mon,mds} metadata" and "node ls" commands
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-05-11 22:01:21 +08:00
Loic Dachary
383f26eb1f
Merge pull request #4551 from theanalyst/doc/release/v0.94.2
...
doc: release notes for hammer v0.94.2 (draft)
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-11 14:48:03 +02:00
Abhishek Lekshmanan
07cf4f7568
doc: release notes for hammer v0.94.2
...
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Conflicts:
doc/release-notes.rst
2015-05-11 18:10:59 +05:30
Kefu Chai
1218d4d823
Merge pull request #4624 from rajukv/wip-xio-rajukv
...
xio: Update XIO client connection IP and nonce
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-11 15:12:34 +08:00
Haomai Wang
ed065cf835
Merge pull request #4620 from yuyuyu101/wip-async-fix-10
...
AsyncConnection: Avoid assert since replacing may inject when unlock
2015-05-11 13:48:59 +08:00
Raju Kurunkad
6158f18fb4
Update XIO client connection IP and nonce
...
Obtain the local IP of the client and save the nonce provided when the messenger was created. This is required for RBD lock/unlock
Fix script error in RBD concurrent test
Reset did_bind during messenger shutdown
Signed-off-by: Raju Kurunkad <raju.kurunkad@sandisk.com>
2015-05-11 10:43:20 +05:30
Loic Dachary
432d86d61e
Merge pull request #4640 from SUSE/wip-rbd-recover-tool-typo-fix
...
doc: rbd-recover-tool: fix typos in comments
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-10 20:16:30 +02:00
Loic Dachary
5736948bfb
Merge pull request #4637 from SUSE/wip-rados-gw-comment-fix
...
doc: rgw: fix typo in comments
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-10 20:13:37 +02:00
Nathan Cutler
88bf25d252
doc: rbd-recover-tool: fix typos in comments
...
Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-05-10 18:26:52 +02:00
Nathan Cutler
05cf0db22d
doc: rgw: fix typo in comments
...
Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-05-10 18:17:53 +02:00
Sage Weil
0334897159
Merge pull request #4628 from dachary/wip-releases
...
doc: add release numbering explanation
2015-05-08 15:01:52 -07:00
Loic Dachary
67fd3c4ef1
doc: add release numbering explanation
...
Mostly copy pasted from Sage's email "The first infernalis dev release
will be v9.0.0".
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-08 22:31:23 +02:00
Loic Dachary
0968134264
doc: move the release cycle after the timeline
...
The timeline is a useful reference and the reader should not have to
scroll down to see it. Move the release cycle after the timeline.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-08 22:31:19 +02:00
Josh Durgin
640902e2e3
Merge pull request #4541 from jbernard/master
...
common/admin_socket: close socket descriptor in destructor
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-08 11:50:38 -07:00
Josh Durgin
0543003f43
Merge pull request #4623 from ceph/wip-11577
...
librbd: possible deadlock during copyup
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-08 11:44:35 -07:00
Travis Rhoden
67da31cf06
debian: add bootstrap-rgw dir to ceph package
...
Signed-off-by: Travis Rhoden <trhoden@redhat.com>
2015-05-08 14:08:34 -04:00
Travis Rhoden
bf93128f66
packaging: Add rgw placeholder dirs in proper packages
...
Automatically create /var/lib/ceph/radosgw with the
ceph-radosgw package, and /var/lib/ceph/bootstrap-rgw
via the ceph package.
Signed-off-by: Travis Rhoden <trhoden@redhat.com>
2015-05-08 14:02:43 -04:00
Jason Dillaman
ee54e71d09
librbd: object map clean state valid only for fast-diff
...
The deep-flatten feature bit is incorrectly used to determine
whether to set the object map to clean. It should use the
fast-diff feature bit.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-05-08 13:32:09 -04:00
Jon Bernard
88fabb1ee6
common/admin_socket: close socket descriptor in destructor
...
Long-running processes that do not reuse a single client connection will
see accumulating file descriptors as a result of not closing the
listening socket. In this case, eventually the system will reach
file-max and subsequent connections will fail.
Fixes : #11535
Signed-off-by: Jon Bernard <jbernard@tuxion.com>
2015-05-08 11:54:06 -04:00
Haomai Wang
a2ee8d79b3
AsyncConnection: Avoid assert since replacing may inject when unlock
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-08 23:50:49 +08:00
Kefu Chai
92bcf6c5ec
Merge pull request #4621 from dachary/wip-pip-timeout
...
install-deps.sh: increase pip install timeout
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-08 23:49:46 +08:00
Yehuda Sadeh
4dc60d9a1e
Merge pull request #4601 from oritwas/nss-cmake
...
cmake fixes
2015-05-08 08:19:41 -07:00
Loic Dachary
dc863fb75e
install-deps.sh: increase pip install timeout
...
It is not uncommon for pip install to timeout with:
Cannot fetch index base URL https://pypi.python.org/simple
because the default timeout is 15 seconds. When running from a CI, it
translates into bursts of false negatives when the network is saturated.
Increase the timeout to 10 minutes which is hopefully large enough to
only happen when there is a serious network problem.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-08 17:06:25 +02:00
Kefu Chai
a23933e4cc
Merge pull request #4588 from dachary/wip-11398-kill-daemons
...
tests: ceph-helpers kill_daemons fails when kill fails
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-08 18:26:09 +08:00
Kefu Chai
6c2182deb2
Merge pull request #4616 from ceph/wip-fix-FTBFS-boost-1.58
...
mon: remove unused variable
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-08 18:18:05 +08:00
Orit Wasserman
f43bf2ec13
cmake: add common_utf8 lib to link unittest_str_map
...
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-05-08 10:59:42 +02:00
Orit Wasserman
1fd2885887
cmake: Add missing pthread lib
...
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-05-08 10:59:42 +02:00
Orit Wasserman
6ce5262853
cmake add mds and librbd missing files
...
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-05-08 10:59:42 +02:00
Orit Wasserman
31b9dc4f99
cmake: add crc assembley files
...
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-05-08 10:59:42 +02:00
Kefu Chai
3222417451
Merge pull request #4615 from dachary/wip-11575-pip-log
...
tests: pip must not log in $HOME/.pip
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-08 16:51:09 +08:00
Loic Dachary
0e26e9f72b
tests: ceph-helpers kill_daemons fails when kill fails
...
Instead of silently leaving the daemons running, it returns failure so
the caller can decide what to do with this situation. The timeout is
also extended to minutes instead of seconds to gracefully handle the
rare situations when a machine is extra slow for some reason.
http://tracker.ceph.com/issues/11398 Fixes : #11398
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-08 10:31:00 +02:00
Kefu Chai
e7b196a4a0
mon: remove unused variable
...
* as a side effect, this change silences
http://tracker.ceph.com/issues/11576
Fixes : #11576
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-08 16:01:23 +08:00
Loic Dachary
c255e809fa
install-deps.sh: exit on error if dependencies cannot be installed
...
Now that pre-installing pip dependencies is done at the end of the
script, the last command to run is no longer the installation
command. Therefore the status of the script is no longer the status of
the install command and no longer reflect success or failure to install
the dependencies. Add explicit || exit 1 to commands that are to be
treated as fatal errors.
Also set -e so that another error has a better chance to be caught.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-08 09:46:02 +02:00
Loic Dachary
7b28a6fd87
tests: pip must not log in $HOME/.pip
...
Because it may not have permission to when running in a container and
scripts run from source are not expected to modify anything outside of
the source tree anyway.
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-05-08 08:59:34 +02:00
Gregory Farnum
4a68b737da
Merge pull request #4614 from ceph/wip-11574-fix-FTBFS
...
json_sprit: fix the FTBFS on old gcc
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-05-07 21:55:36 -07:00
Kefu Chai
6b68b27146
json_sprit: fix the FTBFS on old gcc
...
Fixes : #11574
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-08 12:01:19 +08:00
Haomai Wang
eb32123508
Merge pull request #4611 from yuyuyu101/wip-async-fix-9
...
AsyncConnection: verify connection's state is expected
2015-05-08 11:00:08 +08:00
Haomai Wang
74f3b5c3a0
AsyncConnection: verify connection's state is expected
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-08 10:24:37 +08:00
Yan, Zheng
125ab922d1
Merge pull request #4604 from ceph/wip-11568
...
#11568 : fix error handling in check_pool_perm
2015-05-08 09:13:26 +08:00