RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,538 Commits 211 Branches 0 Tags 1.4 GiB
a4d5ae2861
Commit Graph

43538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
branto1
a4d5ae2861 Merge pull request #5596 from mbroz/wip-selinux-systemd 
Update ceph-selinux rpm spec

Reviewed-by: Boris Ranto <branto@redhat.com>
 2015-08-19 11:00:40 +02:00
Loic Dachary
cf8a360cd1 Merge pull request #5600 from liewegas/wip-osd-bind 
doc: ceph-osd binds to up to 4 ports, not 3

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-08-18 21:19:37 +02:00
Sage Weil
792e24bd30 doc: ceph-osd binds to up to 4 ports, not 3 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-08-18 13:57:37 -04:00
Sage Weil
f2cbbdd7a9 Merge remote-tracking branch 'gh/next' 2015-08-18 11:52:53 -04:00
branto1
7e02fb1f52 Merge pull request #5597 from dachary/wip-12718-restorecon 
ceph-disk: only call restorecon when available

Reviewed-by: Boris Ranto <branto@redhat.com>
 2015-08-18 15:05:02 +02:00
Loic Dachary
3aab146bb7 ceph-disk: only call restorecon when available 
9db80da128 added an unconditional call to
restorecon after mounting the filesystem. It fails when restorecon is
not available and must be made conditional.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-08-18 14:43:15 +02:00
Milan Broz
28d3c4c92b Do not use hardcoded paths in spec post section for selinux commands. 
Signed-off-by: Milan Broz <mbroz@redhat.com>
 2015-08-18 14:25:20 +02:00
Milan Broz
fa2203e951 Add dependence to selinux-policy-base to fix installation in kickstart. 
Signed-off-by: Milan Broz <mbroz@redhat.com>
 2015-08-18 14:25:04 +02:00
Milan Broz
14da7e20d9 Update rpm spec to properly restart systemd ceph.target. 
If we are using systemd, ceph target should be used.
Also fail to restart service should not stop policy to load.

Signed-off-by: Milan Broz <mbroz@redhat.com>
 2015-08-18 14:25:04 +02:00
Gregory Farnum
4751936548 Merge pull request #5595 from ceph/wip-12710 
qa/fsstress.sh: fix 'cp not writing through dangling symlink'

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-08-18 13:07:09 +01:00
Gregory Farnum
3cfb7e4ccc Merge pull request #5594 from ceph/wip-12711 
mds: properly set client incarnation

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-08-18 13:01:17 +01:00
Yan, Zheng
479f2a760b qa/fsstress.sh: fix 'cp not writing through dangling symlink' 
On some test machines, /usr/lib/ltp/testcases/bin/fsstress is
dangling symlink. 'cp -f' is impotent in this case.

Fixes: #12710
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-08-18 15:26:34 +08:00
Yan, Zheng
6387ec9f6f mds: properly set client incarnation 
Fixes: #12711
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-08-18 14:57:04 +08:00
Samuel Just
c3de0affcb Merge pull request #5593 from ceph/revert-4927-snapset-obc 
Revert "osd/ReplicatedPG: snapset is not persisted"

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-08-17 12:59:18 -07:00
Samuel Just
0ba2e145d0 Revert "osd/ReplicatedPG: snapset is not persisted" 2015-08-17 12:58:58 -07:00
Yehuda Sadeh
989820a908 Merge pull request #5577 from oritwas/wip-next-12363 
rgw: we should not overide Swift sent content type

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-08-17 11:19:23 -07:00
Jason Dillaman
d43d6844ec Merge pull request #5558 from s09816/rbd-fix 
rbd:improve the error handle of rbd,check the return value.

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-08-17 11:42:51 -04:00
Noah Watkins
a5e0d8a388 Merge pull request #5586 from ceph/wip-jni-loader 
wip-jni-loader

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-08-17 07:00:39 -06:00
Kefu Chai
7cf4b3a89c Merge pull request #5588 from zhouyuan/isal_yasm_fix 
configure: Fix checking for yasm compatibility

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-08-17 13:20:34 +08:00
Yuan Zhou
0bb57f105f configure: Fix checking for yasm compability 
Fix typo when checking yasm

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
 2015-08-17 10:48:14 +08:00
Noah Watkins
2743cc405a java: add libcommon to deps 
Why do indirect dependencies seem to work randomly:

  undefined symbol: _ZN4ceph3log3Log12create_entryEii

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-08-16 16:15:34 -06:00
Noah Watkins
5afa21d6c7 java: search for JNI bits in common dirs 
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-08-16 16:15:34 -06:00
Kefu Chai
128f5a2504 Merge pull request #5572 from xinxinsh/wip-rados-bench-error 
fix print error of rados bench

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-08-15 11:56:22 +08:00
s09816
af0ebeeb0e rbd:improve the error handle of rbd,check the return value. 
Signed-off-by: s09816 <shi.lu@h3c.com>
 2015-08-14 22:32:18 -04:00
Josh Durgin
ae54a9fa22 Merge pull request #5443 from ceph/wip-wrlock 
cleanup: remove all traces of rados 'lock' operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-08-14 15:50:53 -07:00
Josh Durgin
87fdba9c48 Merge remote-tracking branch 'origin/next' 2015-08-14 14:18:12 -07:00
Josh Durgin
ee909dcc7c Merge pull request #5537 from s09816/master 
rbd:modify the log of purging snaps so that it is more appropriate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-08-14 14:16:46 -07:00
Josh Durgin
1f2f27f172 Merge pull request #5560 from solesoul1127/master 
rbd:Check the dest image name, if it is empty string, return error and give a message

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-08-14 14:03:15 -07:00
xinxin shu
4eaa9ea1c9 fix print error of rados bench 
Total time run:         12.279167
Total writes made:      92
Write size:             4194304
Bandwidth (MB/sec):     30
Stddev Bandwidth:       23.4
Max bandwidth (MB/sec): 64
Min bandwidth (MB/sec): 2
Average IOPS:           7
Stddev IOPS:            6
Max IOPS:               32767
Min IOPS:               -1537890352
Average Latency:        2.12
Stddev Latency:         1.35
Max latency:            6.05
Min latency:            0.501

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
 2015-08-14 22:22:48 +08:00
Yan, Zheng
c577ea2eee Merge pull request #5569 from ceph/wip-unused-var 
client: fix unused var warning
 2015-08-14 15:45:47 +08:00
s09816
7f32a3de78 rbd:modify the log of purging snaps so that it is more appropriate. 
Signed-off-by: s09816 <shi.lu@h3c.com>
 2015-08-13 23:24:55 -04:00
Josh Durgin
7083ed5edf Merge pull request #4744 from ceph/wip-11625 
librbd: diff_iterate should issue concurrent ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-08-13 13:04:19 -07:00
Loic Dachary
84007cf346 Merge pull request #5555 from dachary/wip-mon-test-timeouts 
tests: be more generous with mon tests timeouts

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-08-13 21:11:03 +02:00
Sage Weil
c229f7f626 Merge pull request #5576 from liewegas/wip-dencoder 
simplify handling for objects w/ nondeterministic encoding

Reviewed-by: John Spray <john.spray@redhat.com>
 2015-08-13 15:03:34 -04:00
Orit Wasserman
423cf136f1 rgw: we should not overide Swift sent content type 
Fixes: #12363
backport: hammer

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2015-08-13 20:50:53 +02:00
Sage Weil
623a8e7ce9 test/encoding/check-generated: test sorted json dumps for nondeterministic objects 
Nondeterministic objects dump nondeterministically (usually due
to unordered_map or _set).  Compare their sorted output.  This
is a weaker test but is better than nothing.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-08-13 14:49:40 -04:00
Sage Weil
23119ffacc Revert "osd/HitSet: make subclasses dump deterministically" 
This reverts commit 34c048b3cb.
 2015-08-13 14:37:32 -04:00
Sage Weil
c8bb8a2abb Revert "mon/PGMap: dump osd_epochs in deterministic order" 
This reverts commit 3df6438cd2.
 2015-08-13 14:37:16 -04:00
Sage Weil
46c422f80c Merge pull request #4864 from stevecapperlinaro/for-ceph/journal-page-size-fix 
FileJournal: Remove CEPH_PAGE_SIZE assumptions

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-08-13 11:35:12 -04:00
Sage Weil
9558d59489 Merge pull request #5100 from stevecapperlinaro/for-ceph/tweak-buffer-append-size 
Common: Do not use CEPH_PAGE_SIZE when appending buffers in Ceph

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-08-13 11:34:56 -04:00
Sage Weil
6cb8bc7f44 Merge pull request #5339 from xinxinsh/wip-use-throttle 
use throttle framework to throttle objectstore ops/bytes

Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-08-13 11:34:13 -04:00
Yan, Zheng
4d4fe9dbc0 crypto: fix unbalanced ceph::crypto::init/ceph::crypto:shutdown 
we may create a CephContext without calling common_init_finish(), then
delete the CephContext. In this case, ceph::crypto:init() is not called,
so CephContext::~CephContext() should not call ceph::crypto::shutdown().

Fixes: #12598
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
 2015-08-13 10:46:03 -04:00
Sage Weil
6c6d62fa72 Merge pull request #5573 from SUSE/wip-restart-on-rpm-removal-only 
ceph.spec.in: test %preun argument is zero for removal-only operations
 2015-08-13 10:21:37 -04:00
Nathan Cutler
6c803cdf42 ceph.spec.in: test %preun argument is zero for removal-only operations 
The %preun section now contains logic for disabling and stopping all the
Ceph systemd units when the ceph package is removed. However, there is no
conditional around it, so the units are disabled and stopped on RPM upgrade
as well as removal.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
 2015-08-13 15:36:02 +02:00
Sage Weil
bf0a614fa3 Merge pull request #5562 from varadakari/wip-kvstore-statfs 
Adding statfs api to KeyValueDB

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-08-13 08:51:01 -04:00
Sage Weil
930927bccd Merge pull request #5565 from varadakari/wip-kvstore-makefile 
Remove redundant line from Makefile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-08-13 08:44:42 -04:00
Loic Dachary
5f41e8d25c tests: do not test timeout mon add 
Strictly speaking it's not a feature, but an expected hahaviour. After
discussion it does not seem useful to have that test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-08-13 14:14:02 +02:00
John Spray
f2a38bfa89 client: fix unused var warning 
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-08-13 11:18:20 +01:00
John Spray
593fcc1af8 Merge remote-tracking branch 'origin/next' 2015-08-13 11:00:50 +01:00
John Spray
ad8aaae831 Merge pull request #5564 from wonzhq/test-inode 
mds: initialize 'divergent' to false when comparing inode_t

Reviewed-by: John Spray <john.spray@redhat.com>
 2015-08-13 10:43:53 +01:00