]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Sun, 9 Aug 2015 14:46:10 +0000 (10:46 -0400)]
osd/PGLog: dirty_to is inclusive
There are only two callers of mark_dirty_to who do not pass max,
and they are both in the merge_log extending tail path. In that
case, we want to include the last version specified in the log
writeout. Fix the tail extending code to always specify the
last entry added, inclusive.
Fixes: #12652
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f0ca14df0641daa04eee39d98d8bd0faf46e4e6d )
Ken Dreyer [Fri, 4 Sep 2015 17:50:22 +0000 (11:50 -0600)]
Merge pull request #5224 from SUSE/wip-12304-firefly
ceph.spec.in running fdupes unnecessarily
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Ken Dreyer [Fri, 4 Sep 2015 17:47:49 +0000 (11:47 -0600)]
Merge pull request #5394 from SUSE/wip-12447-firefly
ceph.spec.in: useless %py_requires breaks SLE11-SP3 build
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Loic Dachary [Fri, 4 Sep 2015 15:18:30 +0000 (17:18 +0200)]
Merge pull request #5043 from SUSE/wip-12007-firefly
Objecter: pg listing can deadlock when throttling is in use
Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Fri, 4 Sep 2015 15:08:41 +0000 (17:08 +0200)]
Merge pull request #4769 from SUSE/wip-11741-firefly
crush: take crashes due to invalid arg
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Nathan Cutler [Fri, 4 Sep 2015 14:50:45 +0000 (16:50 +0200)]
Merge pull request #4788 from SUSE/wip-11801-firefly
Make it more difficult to delete pools in firefly
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Fri, 4 Sep 2015 14:44:57 +0000 (16:44 +0200)]
Merge pull request #5235 from SUSE/wip-12310-firefly
read on chunk-aligned xattr not handled
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Fri, 4 Sep 2015 14:42:28 +0000 (16:42 +0200)]
Merge pull request #5389 from SUSE/wip-12391-firefly
EC pools are not allowed as cache pools, disallow in the mon
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Fri, 4 Sep 2015 13:42:03 +0000 (09:42 -0400)]
Merge pull request #5406 from ceph/wip-12465-firefly
log: take mutex while opening fd
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Thu, 3 Sep 2015 10:34:32 +0000 (12:34 +0200)]
Merge pull request #4854 from ceph/wip-11769-firefly
librbd: aio calls may block
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Loic Dachary [Wed, 2 Sep 2015 05:55:15 +0000 (07:55 +0200)]
Merge pull request #5233 from SUSE/wip-12074-firefly
RGW logfile does not get chowned properly
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Nathan Cutler [Wed, 12 Aug 2015 07:43:19 +0000 (09:43 +0200)]
Merge pull request #5390 from SUSE/wip-12503-firefly
rgw/logrotate.conf calls service with wrong init script name
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Yehuda Sadeh [Tue, 11 Aug 2015 18:27:16 +0000 (11:27 -0700)]
Merge pull request #4765 from SUSE/wip-11721-firefly
rgw: Keystone PKI token expiration is not enforced
Nathan Cutler [Thu, 9 Jul 2015 09:51:13 +0000 (11:51 +0200)]
ceph.spec.in: drop SUSE-specific %py_requires macro
%py_requires expands to
BuildRequires: /usr/bin/python
PreReq: python = 2.7
The BuildRequires: is already provided, and the PreReq is wrong because
e.g. SLE11-SP3 (a platform we are trying to support) has Python 2.6.
http://tracker.ceph.com/issues/12351 Fixes: #12351
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
cbf6c7b46b42e163950bf7956e5b7565fca961c9 )
Conflicts:
ceph.spec.in
in master, the %py_requires is in the python-rados package,
while in firefly it is in the python-ceph package
wuxingyi [Wed, 11 Mar 2015 09:34:40 +0000 (17:34 +0800)]
rgw/logrotate.conf: Rename service name
The service name for ceph rados gateway was changed to "ceph-radosgw",
the previous version of service name "radosgw" would cause a failed reload,
and finally make it impossible to write any log data to the log file.
Signed-off-by: wuxingyi <wuxingyi2015@outlook.com>
(cherry picked from commit
9df3f798179481fe8ae6ae873dcb793de7d8f367 )
Samuel Just [Fri, 15 May 2015 20:05:40 +0000 (13:05 -0700)]
OSDMonitor: disallow ec pools as tiers
Fixes: 11650
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
11b7801bb57cb25cd2d26d58722d49691747725b )
Conflicts:
qa/workunits/cephtool/test.sh
no "# make sure we can't clobber snapshot state" tests in firefly
src/mon/OSDMonitor.cc
no tp->removed_snaps.empty() in firefly
Samuel Just [Fri, 24 Jul 2015 22:38:18 +0000 (15:38 -0700)]
Log::reopen_log_file: take m_flush_mutex
Otherwise, _flush() might continue to write to m_fd after it's closed.
This might cause log data to go to a data object if the filestore then
reuses the fd during that time.
Fixes: #12465
Backport: firefly, hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
8778ab3a1ced7fab07662248af0c773df759653d )
- modified to drop m_flush_mutex_holder, which isn't present in firefly
Nathan Cutler [Sat, 25 Jul 2015 11:51:43 +0000 (13:51 +0200)]
Merge pull request #4583 from SUSE/wip-11542-firefly
rgw: Change variable length array of std::strings (not legal in C++) to std::vector<std::string>
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Sat, 25 Jul 2015 11:50:06 +0000 (13:50 +0200)]
Merge pull request #4584 from SUSE/wip-8911-firefly
rgw: doesn't return 'x-timestamp' in header which is used by 'View Details' of OpenStack
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Sat, 25 Jul 2015 11:48:31 +0000 (13:48 +0200)]
Merge pull request #4642 from SUSE/wip-11323-firefly
rgw: quota not respected in POST object
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Nathan Cutler [Sat, 25 Jul 2015 11:24:39 +0000 (13:24 +0200)]
Merge pull request #4641 from SUSE/wip-11149-firefly
rgw: delete bucket does not remove .bucket.meta file
Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
Nathan Cutler [Sat, 25 Jul 2015 11:21:31 +0000 (13:21 +0200)]
Merge pull request #5170 from SUSE/wip-12039-firefly
rgw: Swift API: response for PUT on /container does not contain the mandatory Content-Length header when FCGI is used
Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
Nathan Cutler [Sat, 25 Jul 2015 11:20:15 +0000 (13:20 +0200)]
Merge pull request #4762 from SUSE/wip-11754-firefly
rgw: Object copy bug
Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
Josh Durgin [Fri, 24 Jul 2015 18:42:58 +0000 (11:42 -0700)]
Merge pull request #5171 from SUSE/wip-12240-firefly
librbd: internal.cc: 1967: FAILED assert(watchers.size() == 1)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Fri, 24 Jul 2015 18:26:23 +0000 (11:26 -0700)]
Merge pull request #4639 from SUSE/wip-7385-firefly
librbd: Objectcacher setting max object counts too low
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jason Dillaman [Tue, 2 Jun 2015 14:33:35 +0000 (10:33 -0400)]
tests: verify librbd blocking aio code path
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4cf41486e9c9e1efcb863960a8f3e0326ffca7e5 )
Jason Dillaman [Tue, 2 Jun 2015 02:56:11 +0000 (22:56 -0400)]
librbd: new rbd_non_blocking_aio config option
Setting this option to false reverts librbd to legacy behavior
where AIO operations could potentially block.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
769cad12716b85d87eacc1069dd9f5c21cad3915 )
Conflicts:
src/common/config_opts.h: trivial resolution
src/librbd/librbd.cc: trivial resolution
Jason Dillaman [Fri, 10 Apr 2015 00:34:28 +0000 (20:34 -0400)]
PendingReleaseNotes: document changes to librbd's aio_read methods
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 9 Apr 2015 01:55:36 +0000 (21:55 -0400)]
tests: update librbd AIO tests to remove result code
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Conflicts:
src/test/librbd/test_librbd.cc: trivial resolution
Jason Dillaman [Thu, 9 Apr 2015 17:33:09 +0000 (13:33 -0400)]
librbd: AioRequest::send no longer returns a result
The librados calls used by AioRequest::send should always return
zero unless there is a bug.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
c77bce3311ab62892eb8c1d883263ba7ed663b20 )
Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/AioRequest.h: trivial resolution
src/librbd/internal.cc: trivial resolution
Jason Dillaman [Thu, 9 Apr 2015 01:37:50 +0000 (21:37 -0400)]
librbd: internal AIO methods no longer return result
All failures should be returned via the AioCompletion.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9ab42d613128ab08c688ddbea93df4c95068b9cd )
Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/internal.cc: trivial resolution
src/librbd/internal.h: trivial resolution
Jason Dillaman [Thu, 9 Apr 2015 01:48:21 +0000 (21:48 -0400)]
Throttle: added pending_error method to SimpleThrottle
Allow the client of SimpleThrottle to detect an async error
so that it can exit early.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b88b88c5df91325fb713c2031a56bffe421268e0 )
Jason Dillaman [Thu, 9 Apr 2015 00:18:50 +0000 (20:18 -0400)]
librbd: add new fail method to AioCompletion
Helper method to handle passing fatal errors generated within
librbd (not from the OSDs) back to the client.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
6d1d0c867855a96bee4c13a0c0a39a0e002ccd12 )
Conflicts:
src/librbd/AioCompletion.cc: trivial resolution
src/librbd/AioCompletion.h: trivial resolution
Jason Dillaman [Wed, 8 Apr 2015 23:06:52 +0000 (19:06 -0400)]
librbd: avoid blocking AIO API methods
Enqueue all AIO API methods within the new librbd thread pool to
reduce the possibility of any blocking operations. To maintain
backwards compatibility with the legacy return codes of the API's
AIO methods, it's still possible to block attempting to acquire
the snap_lock.
Fixes: #11056
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3a7b5e30efdb21aa1a0aeb68a5d02a1ac2a5faf3 )
Conflicts:
src/librbd/librbd.cc: trivial resolution
Jason Dillaman [Wed, 8 Apr 2015 21:24:08 +0000 (17:24 -0400)]
librbd: add task pool / work queue for AIO requests
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
afb896d91f886b647baf38f7ec94cc3739f6d2a9 )
Conflicts:
src/common/config_opts.h: trivial resolution
src/librbd/ImageCtx.cc: trivial resolution
src/librbd/ImageCtx.h: trivial resolution
src/librbd/internal.cc: trivial resolution
Jason Dillaman [Mon, 11 May 2015 21:05:49 +0000 (17:05 -0400)]
WorkQueue: added virtual destructor
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b3f5a75332c058816dc39b71e9d2b36e752159f4 )
Jason Dillaman [Wed, 8 Apr 2015 20:46:34 +0000 (16:46 -0400)]
WorkQueue: add new ContextWQ work queue
The queue holds a collection of Context pointers that will
be completed by the thread pool.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
24a33e977f7b71962adeeb48f75d488a76e70fa9 )
Conflicts:
src/common/WorkQueue.h: trivial resolution
Sage Weil [Fri, 5 Dec 2014 22:21:08 +0000 (14:21 -0800)]
common/ceph_context: don't import std namespace
This was broken by
7fed5dee4f96a83d1d6914f6fc0895bba2d15b99
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
9029813b2784fe71879b1b7684855415b4c7566b )
Haomai Wang [Mon, 1 Dec 2014 15:54:16 +0000 (23:54 +0800)]
CephContext: Add AssociatedSingletonObject to allow CephContext's singleton
If some objects associated to CephContext want to create a singleton object,
it can inherit AssociatedSingletonObject and implement destruction to get notified.
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit
7fed5dee4f96a83d1d6914f6fc0895bba2d15b99 )
Sage Weil [Fri, 16 Jan 2015 15:54:22 +0000 (07:54 -0800)]
mon/OSDMonitor: require mon_allow_pool_delete = true to remove pools
This is a simple safety check. Since we default to true it is currently
opt-in.
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6b982e4cc00f9f201d7fbffa0282f8f3295f2309 )
Conflicts:
src/test/mon/osd-pool-create.sh
Changed $CEPH_MON to 127.0.0.1 -- the CEPH_MON was introduced after
firefly to allow tests to run in parallel. Back in firefly all tests
use the same port because 127.0.0.1 was hardcoded. We can't
conveniently backport all that's necessary for tests to run in
parallel, therefore we keep the 127.0.0.1 hardcoded.
Conflicts:
src/test/mon/osd-pool-create.sh
TEST_no_pool_delete() follows a different test than in master
Loic Dachary [Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)]
Merge pull request #5051 from SUSE/wip-12016-firefly
osd: cache full mode still skips young objects
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 22 Jul 2015 15:36:47 +0000 (11:36 -0400)]
Merge pull request #5307 from dachary/wip-release-notes-firefly
backport v0.80.10 release notes to firefly
Guang Yang [Mon, 15 Sep 2014 11:41:06 +0000 (11:41 +0000)]
For pgls OP, get/put budget on per list session basis, instead of per OP basis, which could lead to deadlock.
Signed-off-by: Guang Yang (yguang@yahoo-inc.com)
(cherry picked from commit
0f884fdb31a26f241401ce2a9329dc0f2c4eccc7 )
Conflicts:
src/librados/IoCtxImpl.cc
In firefly, return value of objecter->pg_read() is not assigned to c->tid.
src/osdc/Objecter.cc
src/osdc/Objecter.h
There is no _op_submit_with_budget() function in firefly.
There is no Objecter::_finish_op() function in firefly.
In firefly, _take_op_budget() is called take_op_budget().
Loic Dachary [Wed, 22 Jul 2015 08:20:32 +0000 (10:20 +0200)]
Merge pull request #4867 from SUSE/wip-11878-firefly
mon: Clock skew causes missing summary and confuses Calamari
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Thorsten Behrens [Fri, 6 Feb 2015 00:26:40 +0000 (01:26 +0100)]
Always provide summary for non-healthy cluster.
This fixes a problem, wherein calamari does not provide
popup drill-downs for warnings or errors, should the summary
be missing.
Calamari gets health info from /api/v1/cluster/$FSID/health.
If the data here has a summary field, this summary is provided
in a popup window:
/api/v1/cluster/$FSID/health is populated (ultimately) with
status obtained via librados python bindings from the ceph
cluster. In the case where there's clock skew, the summary
field supplied by the ceph cluster is empty.
No summary field, no popup window with more health details.
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit
eaf6e0cf48488fe604d0ef0db164d44948d4e8d4 )
Conflicts:
src/mon/Monitor.cc
firefly needs ss
Josh Durgin [Tue, 21 Jul 2015 20:31:33 +0000 (13:31 -0700)]
Merge pull request #5062 from SUSE/wip-11699-firefly
objecter: resend linger ops on split
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Tue, 21 Jul 2015 16:54:19 +0000 (12:54 -0400)]
doc: v0.80.10 changelog
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
b3a3e0e509eb9530994723ed9d68f85b8434a22d )
Sage Weil [Tue, 21 Jul 2015 14:55:18 +0000 (10:55 -0400)]
doc/release-notes: v0.80.10
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
2a61b611987d169d5a501d77fbd545068550c28c )
Conflicts:
doc/release-notes.rst
Loic Dachary [Tue, 14 Jul 2015 14:15:44 +0000 (16:15 +0200)]
doc/release-notes: update notes for v0.80.10
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit
1231ae09d675f2ee9e76a04b91f771d73a2fb346 )
Conflicts:
doc/release-notes.rst
Loic Dachary [Tue, 21 Jul 2015 11:03:07 +0000 (13:03 +0200)]
Merge pull request #5129 from SUSE/wip-12202-firefly
mon: ceph fails to compile with boost 1.58
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:51:10 +0000 (12:51 +0200)]
Merge pull request #5044 from SUSE/wip-12011-firefly
osd: PG stuck with remapped
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:45:22 +0000 (12:45 +0200)]
Merge pull request #5039 from SUSE/wip-11961-firefly
osd: Cleanup boost optionals for boost 1.56
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:39:34 +0000 (12:39 +0200)]
Merge pull request #5037 from SUSE/wip-11875-firefly
tools: ceph-post-file fails on rhel7
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:34:51 +0000 (12:34 +0200)]
Merge pull request #4771 from SUSE/wip-11759-firefly
tools: ceph-disk: support NVMe device partitions
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:22:52 +0000 (12:22 +0200)]
Merge pull request #4636 from SUSE/wip-11143-firefly
tools: src/ceph-disk : disk zap sgdisk invocation
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:20:50 +0000 (12:20 +0200)]
Merge pull request #4635 from SUSE/wip-7387-firefly
common: Malformed JSON command output when non-ASCII strings are present
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:17:43 +0000 (12:17 +0200)]
Merge pull request #4632 from SUSE/wip-11507-firefly
osd: object creation by write cannot use an offset on an erasure coded pool
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:12:36 +0000 (12:12 +0200)]
Merge pull request #4630 from SUSE/wip-10983-firefly
tools: use a new disk as journal disk,ceph-disk prepare fail
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:08:26 +0000 (12:08 +0200)]
Merge pull request #4597 from xinxinsh/wip-11026-firefly
objecter: can get stuck in redirect loop if osdmap epoch == last_force_op_resend
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 21 Jul 2015 10:04:39 +0000 (12:04 +0200)]
Merge pull request #4582 from SUSE/wip-11543-firefly
tools: ceph_argparse_flag has no regular 3rd parameter
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Josh Durgin [Fri, 17 Jul 2015 23:10:43 +0000 (16:10 -0700)]
Merge pull request #4633 from SUSE/wip-11535-firefly
Client admin socket leaks file descriptors
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Wed, 18 Mar 2015 20:49:20 +0000 (13:49 -0700)]
os/chain_xattr: handle read on chnk-aligned xattr
If we wrote an xattr that was a multiple of a chunk, we will try to read
the next chunk and get ENODATA. If that happens bail out of the loop and
assume we've read the whole thing.
Backport: hammer, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
8614dcebf384b74b283cd352001a65fa26ba925c )
Conflicts:
src/test/objectstore/chain_xattr.cc
added #define FILENAME
Thorsten Behrens [Wed, 10 Dec 2014 10:53:43 +0000 (11:53 +0100)]
Unconditionally chown rados log file.
This fixes bnc#905047 (in a somewhat ad-hoc way). Sadly the log
file gets created from several places, so its existence does not
mean init-radosgw had actually run.
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit
41611ea27a42d6221c418613d24dce34d988f2e6 )
Nathan Cutler [Mon, 13 Jul 2015 16:12:01 +0000 (18:12 +0200)]
ceph.spec.in: do not run fdupes, even on SLE/openSUSE
In openSUSE there is a policy to use %fdupes in the spec file if RPMLINT
complains about duplicate files wasting space in the filesystem.
However, RPMLINT is not so complaining, so drop fdupes.
http://tracker.ceph.com/issues/12301 Fixes: #12301
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
53072b9019caf72e0313b2804ea174237ed7da33 )
Samuel Just [Fri, 10 Jul 2015 00:24:04 +0000 (17:24 -0700)]
Merge pull request #4631 from SUSE/wip-11069-firefly
PGLog: split divergent priors as well
Reviewed-by: Samuel Just
Jason Dillaman [Fri, 26 Jun 2015 13:59:36 +0000 (09:59 -0400)]
librbd: assertion failure race condition if watch disconnected
It's possible for librbd's watch of the header object to be reset by
connection issues just prior to the image being removed. This will
causes an assertion failure which assumes at least one watcher on the
image.
Fixes: #12176
Backport: hammer, firefly
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
af276de4f299960e43761904c043924cec5fef11 )
Radoslaw Zarzynski [Sun, 8 Mar 2015 21:45:34 +0000 (22:45 +0100)]
rgw: send Content-Length in response for HEAD on Swift account.
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
29073d84640b61d0221b2d2ab73c271d60fd13ba )
Radoslaw Zarzynski [Fri, 6 Mar 2015 12:18:19 +0000 (13:18 +0100)]
rgw: send Content-Length in response for DELETE on Swift container.
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
d260a93405a7a34a899f716bd9c4e731baa9ffd0 )
Radoslaw Zarzynski [Fri, 6 Mar 2015 12:14:26 +0000 (13:14 +0100)]
rgw: send Content-Length in response for PUT on Swift container.
Fixes: #11036
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
10c1f1aa1e09df5edf5d2f9f9b0273ddbcb384fa )
Radoslaw Zarzynski [Fri, 27 Feb 2015 14:23:16 +0000 (15:23 +0100)]
rgw: send Content-Length in response for GET on Swift container.
Fixes: #10971
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
5a64fb5430b6b42174bf53a5910d9435043c1380 )
Radoslaw Zarzynski [Fri, 6 Mar 2015 11:42:52 +0000 (12:42 +0100)]
rgw: enable end_header() to handle proposal of Content-Length.
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
f98fd4dfda7a105d621f99c2b48eb9ab9b45d979 )
Kefu Chai [Fri, 8 May 2015 07:21:20 +0000 (15:21 +0800)]
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>
(cherry picked from commit
e7b196a4a091c0ea258866559ba06e7ed0cc4247 )
Josh Durgin [Mon, 20 Oct 2014 20:29:13 +0000 (13:29 -0700)]
Objecter: resend linger ops on any interval change
Watch/notify ops need to be resent after a pg split occurs, as well as
a few other circumstances that the existing objecter checks did not
catch.
Refactor the check the OSD uses for this to add a version taking the
more basic types instead of the whole OSD map, and stash the needed
info when an op is sent.
Fixes: #9806
Backport: giant, firefly, dumpling
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit
cb9262abd7fd5f0a9f583bd34e4c425a049e56ce )
Conflicts:
src/osd/osd_types.cc
src/osdc/Objecter.cc
Minor differences.
Samuel Just [Wed, 7 May 2014 18:02:16 +0000 (11:02 -0700)]
osd_types: factor out is_new_interval from check_new_interval
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit
2ee355113ed4374c664909a8cd7dc5dfdc4c9ed7 )
Xinze Chi [Wed, 5 Nov 2014 01:00:01 +0000 (01:00 +0000)]
osd: cache pool: flush object ignoring cache min flush age when cache pool is full
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit
f4ee9496ed15e7734abd659f5a353a3cde0dcb23 )
Zhiqiang Wang [Fri, 1 Aug 2014 08:09:50 +0000 (16:09 +0800)]
osd: add local_mtime to struct object_info_t
This fixes a bug when the time of the OSDs and clients are not
synchronized (especially when client is ahead of OSD), and the cache
tier dirty ratio reaches the threshold, the agent skips the flush work
because it thinks the object is too young.
Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
(cherry picked from commit
13b9dc708426c35436ba58388fc54f04f066f03a )
Guang Yang [Mon, 13 Oct 2014 04:18:45 +0000 (04:18 +0000)]
The fix for issue 9614 was not completed, as a result, for those erasure coded PGs with one OSD down, the state was wrongly marked as active+clean+degraded. This patch makes sure the clean flag is not set for such PG.
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
(cherry picked from commit
35bbb2d6002b1b435ff0b1df653cc7ab271f9258 )
William A. Kennington III [Sun, 21 Sep 2014 05:52:31 +0000 (22:52 -0700)]
osd: Cleanup boost optionals
Signed-off-by: William A. Kennington III <william@wkennington.com>
(cherry picked from commit
a53ead14c113047567177630b4906136a2109b65 )
Sage Weil [Mon, 1 Jun 2015 22:10:14 +0000 (15:10 -0700)]
Makefile: install ceph-post-file keys with mode 600
Otherwise ssh (may) prompt for a password.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
106a1c3081d02446aa3d8e13865da0c3393bae90 )
Joseph McDonald [Mon, 1 Jun 2015 22:05:32 +0000 (15:05 -0700)]
ceph-post-file: improve check for a source install
Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
(cherry picked from commit
ee170eadcdcb4b54d36a7d474558484de9d917eb )
Joseph McDonald [Mon, 1 Jun 2015 22:00:39 +0000 (15:00 -0700)]
ceph-post-file: behave when sftp doesn't take -i
Fixes: #11836
Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
(cherry picked from commit
b84031ed5eaace1222e14d3c4076a3ab1155da96 )
David Zafman [Fri, 19 Jun 2015 22:57:46 +0000 (15:57 -0700)]
Merge pull request #4960 from ceph/wip-10911-firefly
osd,mon: explicitly specify OSD features in MOSDBoot
Reviewed-by: David Zafman <dzafman@redhat.com>
Jenkins [Thu, 18 Jun 2015 16:48:56 +0000 (09:48 -0700)]
0.80.10
Sage Weil [Wed, 17 Jun 2015 16:35:28 +0000 (09:35 -0700)]
qa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax
It's -, then a list of all exclusions separated by :. There are just 2.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
78d894a634d727a9367f809a1f57234e5e6935be )
Sage Weil [Wed, 17 Jun 2015 04:05:29 +0000 (21:05 -0700)]
qa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
3e8d60a80ce31860eac76a1f6489a35e1795a0c0 )
Josh Durgin [Mon, 15 Jun 2015 22:12:43 +0000 (15:12 -0700)]
qa: add compatibility filtered rados api tests for upgrades
Post-9.0.1, the evict op returns success when an object doesn't exist
in the cache tier. Skip the tests that are incompatible across
versions.
Fixes: #11548
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
348a3d3c9880e7d022e71a2faafe51c8f771406e )
Sage Weil [Wed, 18 Feb 2015 22:53:04 +0000 (14:53 -0800)]
osd,mon: explicitly specify OSD features in MOSDBoot
We are using the connection features to populate the features field in the
OSDMap, but this is the *intersection* of mon and osd features, not the
osd features. Fix this by explicitly specifying the features in
MOSDBoot.
Fixes: #10911
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
bee91548b07c6a28314dddc50fef8b6a2677e774 )
Conflicts:
src/osd/OSD.cc
Minor difference in the MOSDBoot constructor
Sage Weil [Wed, 10 Jun 2015 22:03:48 +0000 (15:03 -0700)]
Merge pull request #4924 from ceph/wip-11955-firefly
11955: ceph.spec.in: package mkcephfs on EL6
Reviewed-by: Sage Weil <sage@redhat.com>
Ken Dreyer [Wed, 10 Jun 2015 21:43:41 +0000 (15:43 -0600)]
ceph.spec.in: package mkcephfs on EL6
Commit
efbca0465c2946e113771966df08cf7cf37b1196 added mkcephfs to the
RPM %files listing, but this /usr/sbin path is only correct for CentOS
7. In CentOS 6, the utility is present at /sbin/mkcephfs instead. This
causes rpmbuild to fail to build the tip of the firefly branch on EL6.
Adjust the RPM %files list so we properly package mkcephfs on both EL7
and EL6.
http://tracker.ceph.com/issues/11955 Refs: #11955
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
xinxin shu [Wed, 6 May 2015 21:49:18 +0000 (05:49 +0800)]
osdc: add epoch_t last_force_resend in Op/LingerOp.
Using this field record the pg_poo_t::last_force_op_resend to avoid op
endless when osd reply with redirect.
Fixes: #11026
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
def4fc4a )
Orit Wasserman [Thu, 4 Jun 2015 17:07:03 +0000 (19:07 +0200)]
Merge pull request #4851 from ceph/wip-10873-firefly
rgw: generate the "Date" HTTP header for civetweb.
Radoslaw Zarzynski [Wed, 18 Feb 2015 14:48:43 +0000 (15:48 +0100)]
rgw: generate the "Date" HTTP header for civetweb.
Fixes: #10873
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
ea384f83b601f60e135c3d3f960fdb75a919dd84 )
Sage Weil [Wed, 3 Jun 2015 17:03:50 +0000 (13:03 -0400)]
ceph.spec: add mkcephfs to ceph.rpm
Signed-off-by: Sage Weil <sage@redhat.com>
Ken Dreyer [Tue, 2 Dec 2014 20:58:10 +0000 (13:58 -0700)]
packaging: package ceph-disk(8)
The ceph-disk man page was added in
a450cab2b8148cb8a9b043d629feccf89e5aabac , but this was not added to the
RPM or DEB packaging. Add it here.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
b743a951114b00bbb6e14fb88f1928b504bc0f8b )
Yehuda Sadeh [Tue, 2 Jun 2015 16:53:03 +0000 (19:53 +0300)]
Merge pull request #4780 from oritwas/wip-10295-firefly
rgw: civetweb should use unique request id
Reviewd-by: Yehuda Sadeh <yehuda@rehat.com>
Yehuda Sadeh [Tue, 2 Jun 2015 16:02:07 +0000 (19:02 +0300)]
Merge pull request #4829 from oritwas/wip-negative_content_length-firefly
rgw: don't allow negative / invalid content length
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 1 Aug 2014 23:15:36 +0000 (16:15 -0700)]
rgw: don't allow negative / invalid content length
Certain frontends (e.g., civetweb) don't filter such requests.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
0e74b7a1d56733358e2f1d3df4386125a94c2966 )
Sage Weil [Wed, 27 May 2015 22:36:15 +0000 (15:36 -0700)]
Merge pull request #4766 from SUSE/wip-11673-firefly
Debian: ceph-test and rest-bench debug packages should require their respective binary packages
Reviewed-by: Sage Weil <sage@redhat.com>
Orit Wasserman [Thu, 23 Apr 2015 15:36:47 +0000 (17:36 +0200)]
rgw: civetweb should use unique request id
max_req_id was moved to RGWRados and changed to atomic64_t.
The same request id resulted in gc giving the same idtag to all objects
resulting in a leakage of rados objects. It only kept the last deleted object in
it's queue, the previous objects were never freed.
Fixes: 10295
Backport: Hammer, Firefly
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
c262259 )
Conflicts:
src/rgw/rgw_main.cc
src/rgw/rgw_rados.h
islepnev [Fri, 17 Apr 2015 19:33:01 +0000 (22:33 +0300)]
ceph-disk: support NVMe device partitions
Linux nvme kernel module v0.9 enumerate devices as following:
/dev/nvme0 - characted revice
/dev/nvme0n1 - whole block device
/dev/nvme0n1p1 - first partition
/dev/nvme0n1p2 - second partition
http://tracker.ceph.com/issues/11612 Fixes: #11612
Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
(cherry picked from commit
9b62cf254d02d30609793be8b1cb8a94f38891f1 )
Conflicts:
src/ceph-disk