Samuel Just
d75824d9ef
Merge pull request #5666 from liewegas/wip-12785
...
osd: fix off-by-one in hobject_t::is_temp() (bug 12785)
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-28 09:17:54 -07:00
Sage Weil
c2a9641c96
Merge pull request #5609 from rohanmars/wip-timegm
...
added boost timegm impl for cross platform support
In the future it would be nice to avoid duplication of the code in each compiled module, but this works for now. The only real user right now is rgw.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 12:14:41 -04:00
Sage Weil
4c00183996
Merge pull request #5627 from wonzhq/agent-work
...
osd: do evict before flush in agent_work
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 12:13:57 -04:00
Sage Weil
620c4177ea
Merge pull request #5640 from liewegas/wip-mutex-lock
...
mutex: avoid trylock unless instrumentation is enabled
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-08-28 12:13:38 -04:00
Sage Weil
7942db555f
Merge pull request #5656 from XinzeChi/wip-buffer-emtpyptr
...
common: fix insert empty ptr when bufferlist rebuild
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 12:12:45 -04:00
Kefu Chai
9c86b8e699
Merge pull request #5453 from wonzhq/recover-primary
...
osd: recovery fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 23:45:25 +08:00
Kefu Chai
2b17da399b
Merge pull request #5415 from wonzhq/do-recovery
...
osd: do_recovery cleanup
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-28 23:40:41 +08:00
Sage Weil
4a3454358a
Merge pull request #5703 from ceph/wip-boost-random-cmake
...
CMake: update for boost_random
2015-08-28 11:14:31 -04:00
John Spray
a3fc6e8356
CMake: update for boost_random
...
This became a dependency in dbcaa544
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-28 15:34:12 +01:00
Loic Dachary
34411efad5
Merge pull request #5701 from guce/h3c_mail_organization_map
...
h3c mail organization map
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-28 12:23:19 +02:00
guce
e92d2f38c5
h3c mail organization map
...
update .mailmap and .organizationmap for h3c organization
Signed-off-by: Ce Gu <guce@h3c.com>
2015-08-28 17:56:34 +08:00
Kefu Chai
52bc4886b7
Merge pull request #5114 from branch-predictor/bp-reduced-memzero
...
ObjectStore/FileJournal: reduce impact of memset()
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 10:08:56 +08:00
David Zafman
0a7c4e390b
Merge pull request #5688 from dzafman/wip-decode-zafman
...
osd: Decode use_gmt_hitset with a unique version
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 12:58:47 -07:00
Samuel Just
46e7f36785
Merge pull request #5679 from wonzhq/store-test
...
test: disable newstore test until it's merged
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-27 11:59:49 -07:00
David Zafman
2bc5a48f4c
osd: Decode use_gmt_hitset with a unique version
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-08-27 11:25:00 -07:00
John Spray
60e58b010c
Merge pull request #5545 from ceph/wip-objclass-filters
...
Allow object classes to define PGLS filters
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-08-27 18:14:37 +01:00
Sage Weil
cbe101e7db
Merge remote-tracking branch 'gh/wip-osd-compat'
...
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-27 13:05:40 -04:00
Sage Weil
68d1d8ee38
Merge pull request #5683 from tchaikov/wip-hitset-gmt-yet-another-feature-bit
...
osd: do not let OSD_HITSET_GMT reuse the feature bit
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 12:41:54 -04:00
Kefu Chai
5a4f6a866b
osd: do not let OSD_HITSET_GMT reuse the feature bit
...
* to ease the backport to hammer
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-28 00:39:12 +08:00
Joao Eduardo Luis
f1e1ada768
Merge pull request #5524 from tchaikov/wip-monstore-cache
...
mon: add a cache layer over MonitorDBStore
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 16:21:16 +01:00
Sage Weil
cba062e4a8
Merge pull request #5669 from yuyuyu101/wip-12745
...
ms/simple: Messenger/MessengerTest.SyntheticInjectTest2/1 hang
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 10:10:55 -04:00
Sage Weil
3eb36fc732
doc/release-notes: v0.94.3
...
Fix up the release timeline link for v9.0.3 too.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-27 10:06:07 -04:00
John Spray
f5df1e4884
osd: separate filter init from construction
...
...so that implementations can readily handle
decode errors in client args and return an
error code.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
John Spray
2777438b36
test: add a test for filter in cls hello
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
John Spray
60d51fc4a9
cls: add a filter to the hello class for testing
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
John Spray
e749b214e7
objclass: enable unregistering filter factory
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
Haomai Wang
328d30cb78
AsyncConnection: Fix uninitialized variable compile warning
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-27 16:53:17 +08:00
Haomai Wang
24f4d22d21
TestMsgr: Fix forever hang under lossless policy and one is WAIT another down
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-27 16:53:15 +08:00
Orit Wasserman
7515c04716
Merge pull request #5651 from theanalyst/rgw/fixiso8601
...
rgw: be more flexible with iso8601 timestamps
2015-08-27 10:38:36 +02:00
Zhiqiang Wang
10fd1a560f
test: don't unmount when no store is created
...
When store is not created in SetUp for some reasons, unmounting it would
lead to segment fault.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-27 12:27:52 +08:00
Zhiqiang Wang
83ba59780e
test: handle the case when ObjectStore::create returns NULL
...
When the objectstore type doesn't exist, NULL is returned in SetUp.
Handle the NULL return code to avoid a segment fault.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-27 11:17:17 +08:00
Zhiqiang Wang
6a735d6257
test: disable newstore test until it's merged
...
Newstore hasn't been merged. It leads to a segment fault in one of the
teuthology testing job since ObjectStore::create() returns NULL.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-27 11:08:42 +08:00
Sage Weil
b224eb455a
Merge pull request #4456 from ceph/wip-user
...
run ceph daemons as user and group ceph
2015-08-26 20:41:05 -04:00
Sage Weil
c825fd7604
Merge pull request #5674 from ceph/wip-selinux-post-script
...
ceph.spec.in: Restart services only if they are running
Reviewed-by: Milan Broz <mbroz@redhat.com>
2015-08-26 20:38:53 -04:00
Sage Weil
743b15b412
debian: /var/run/ceph should be owned by ceph:ceph
...
Fix upstart and sysvinit scripts to create /var/run/ceph properly.
Chown existing dir on upgrade.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
48f98e1d7c
upstart: setuser ceph
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
c86055398c
debian/ceph-common.dirs: install /var/lib/ceph
...
It is the ceph user's home dir and we need to set the ownership.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
94da8c1e7a
debian/ceph-common.postinst: fix adduser, addgroup
...
Drop the extra groups thing--it's broken anyway.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
7c96016876
debian/ceph-common.postinst: fix /var/log/ceph permissions
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
18e0c7778a
debian: rename ceph-common.postinst
...
There was a trailing space!
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
7cd07490f2
PendingReleaseNotes: more notes about the 'ceph' user
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
b89d752181
global_init: ignore --set{user,group} if not root
...
Assume these options can only drop privileges; normal users can't setuid
root (and even if they could we wouldn't want to).
This makes ceph-disk behave when it sees the ceph user as 'root' and
invokes things with --setuser root but runs as a non-root user.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:15 -04:00
Sage Weil
aef00eb891
ceph-disk: fix get_ceph_user
...
getpwnam throws an exception
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:14 -04:00
Sage Weil
960139edba
PendingReleaseNotes: some notes about upgrade and ceph user
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:35:14 -04:00
Sage Weil
8f3185bade
systemd: use --setuser and --setgroup for all daemons
...
Allow all daemons drop privilege themselves, instead of letting
systemd do it.
Among other things, this means that admins can conditionally not
drop prives by setting
setuser match path = /var/lib/ceph/$type/$cluster-$id
in their ceph.conf to ease the pain of upgrade.
Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-08-26 20:34:15 -04:00
Sage Weil
28fdac32e7
global: implement setuser_match_path
...
Allow the --setuser and --setgroup to be conditional on the
specified user/group matching the ownership of a given path.
This allows the ceph daemons to switch to user ceph for newly
deployed instances or stay as root depending on the ownership of
the data directory.
Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-08-26 20:34:15 -04:00
Milan Broz
09db67fdb5
ceph-disk: set owner of created files to ceph
...
Signed-off-by: Milan Broz <mbroz@redhat.com>
2015-08-26 20:34:15 -04:00
Milan Broz
52e978e4b3
Set keys owner to ceph user if exists.
...
Also fix directory access rigths.
Signed-off-by: Milan Broz <mbroz@redhat.com>
2015-08-26 20:34:15 -04:00
Milan Broz
8bd35bd607
Set Ceph device partitions owner to ceph user in udev.
...
Signed-off-by: Milan Broz <mbroz@redhat.com>
2015-08-26 20:34:15 -04:00
Sage Weil
bbedc8e57e
ceph-osd-prestart.sh: ensure data dir is root or ceph before start
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:34:15 -04:00