Commit Graph

40514 Commits

Author SHA1 Message Date
Sage Weil
a05871a185 Merge pull request #4160 from ceph/wip-rocksdb
update rocksdb
2015-03-30 10:57:07 -07:00
Sage Weil
a4c01f38f1 mark kinetic experimental
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-30 10:00:01 -07:00
Sage Weil
002b7fdadf mark rocksdb experimental
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-30 10:00:01 -07:00
Kefu Chai
f47a572424 Merge pull request #4183 from stiopaa1/OSDMonTrailingSpaces
mon/OSDMonitor: remove trailing whitespaces

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-30 16:43:37 +08:00
Gregory Farnum
493eff569e Merge pull request #4209 from ceph/wip-java
fix rhel linking error

Backport: giant, firefly, dumpling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-28 11:02:52 -07:00
Noah Watkins
aed3434dc7 java: libcephfs_jni.so is in /usr/lib64 on rhel
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2015-03-27 19:34:12 -07:00
Noah Watkins
f5a95dc700 java: dump extra info for ftruncate assertion
Nightly ran and encountered a situation in which fstat following
ftruncate reported a size not equal to the truncated size.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2015-03-27 19:09:15 -07:00
Gregory Farnum
71a0c793ab Merge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion
mds: fixed the ceph get mdsmap assertion.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:35:30 -07:00
Gregory Farnum
c50f5b1e26 Merge pull request #4173 from ceph/wip-mds-kill-session
Wip mds kill session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
2015-03-27 11:29:19 -07:00
Gregory Farnum
7721b224c4 Merge pull request #4168 from ceph/wip-11226-dir-fx
RFC client: Hold on to exclusive caps on directories we "own"

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-27 11:28:31 -07:00
Gregory Farnum
0e4a75b2e3 Merge pull request #4177 from ceph/wip-11226-extra
Wip 11226 extra

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:27:58 -07:00
Gregory Farnum
413da564d4 Merge pull request #4189 from ceph/wip-11236
test_libcephfs: do cleanup in ReleaseMounted test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:26:21 -07:00
Gregory Farnum
bd1d11f6eb Merge pull request #4192 from ceph/wip-11218
#11218: Multi-MDS fixes for 'damaged' ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-27 11:24:50 -07:00
Josh Durgin
015c643735 Merge pull request #4199 from ceph/wip-11250
cls_rbd: fix read past end of bufferlist c_str() in debug log msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-27 08:51:19 -07:00
John Spray
f3f37a3293 Merge pull request #4200 from ceph/wip-mds-remove-inode
mds: properly remove inode after purging stray

Reviewed-by: John Spray <john.spray@redhat.com>
2015-03-27 11:33:07 +00:00
Vicente Cheng
f4398d2e6c Fixed the ceph get mdsmap assertion.
When we want to get mdsmap, we try to get_version()
    and the return value err = 0 means success.

    The assert verified r == 0. r would not change in this flow.
    It always meet assert and lead mon failure.

    I think this verify should be:
        assert(err == 0)
    It will help to check return value of get_version().

If you have any questions, feel free to let me know.
Thanks!

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
2015-03-27 18:49:28 +08:00
Kefu Chai
d3029fe72a Merge pull request #4193 from larkly/patch-docerror-erasure
doc: Incomplete example in erasure-coded-pool.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-27 18:31:16 +08:00
Yan, Zheng
d789f44074 mds: properly remove inode after purging stray
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-27 15:10:53 +08:00
Sage Weil
ea32960f58 cls_rbd: fix read past end of bufferlist c_str() in debug log msg
Fixes: #11250
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-26 21:00:00 -07:00
Sage Weil
877d5d8820 Merge pull request #4171 from majianpeng/cleanup
common: print hexadecimal for ghobject_t.generation.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-26 17:45:20 -07:00
Bosse Klykken
d6acc6a581 Doc: Incomplete example in erasure-coded-pool.rst
Signed-off-by: Bosse Klykken <larkly@gmail.com>
2015-03-26 21:31:16 +01:00
Sage Weil
90c38b5b97 rocksdb: fix 32-bit build
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-26 11:04:18 -07:00
Sage Weil
ddad2d4465 Makefile-rocksdb.am: update for latest rocks
Lots of files changed here; rebuilt the list from scratch.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-26 11:01:35 -07:00
Josh Durgin
887354099e Merge pull request #4113 from wonzhq/rbd-fix
rbd: misc fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-26 10:06:37 -07:00
John Spray
6413209ef3 mds: include damaged in MDSMap::dump
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 15:48:55 +00:00
John Spray
3b2a0917e8 mds: update peer failure response to account for damaged
...by calling get_down_mds_set instead of get_failed_mds_set.

Also remove a redundant if(true) around this region.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 13:11:44 +00:00
John Spray
f311bb77e3 mds: add get_down_mds_set method
For places where we would like to treat failed
and damaged MDS ranks the same, like detecting
when someone has dropped offline.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 13:11:44 +00:00
John Spray
7eccf920ba mds: account for 'damaged' in MDSMap::is_degraded
Fixes: #11218
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 13:11:44 +00:00
John Spray
aae265bfe1 mds: clarify MDBalancer::send_heartbeat
The initial is_degraded() check guarantees that
the 'in' set is equal to the 'up' set.  Later,
this calls get_mds_set and assigns it to a variable
called 'up'.

It's clearer to use get_up_mds_set into the variable
called up (this was confusing when debugging #11218
which was itself a result of is_degraded() ignoring
damaged ranks).

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-26 12:54:53 +00:00
Yan, Zheng
c7d5c02680 test_libcephfs: do cleanup in ReleaseMounted test
Fixes: #11236
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-26 15:21:52 +08:00
Loic Dachary
9008a3391d Merge pull request #4188 from XinzeChi/wip-test-1
test: add compile-command for test_ceph_daemon.py

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-26 07:45:05 +01:00
Xinze Chi
9418e432ad test: add compile-command for test_ceph_daemon.py
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-03-26 13:58:33 +08:00
Jianpeng Ma
aa6a46cfd9 common: print hexadecimal for ghobject_t.generation & shard_id
In filestore, it use hexadecimal for ghobject_t.generation &
shard_id. Make the same.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-03-26 13:51:02 +08:00
Michal Jarzabek
b9e89fcb0b mon/OSDMonitor: remove trailing whitespaces
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2015-03-25 21:22:31 +00:00
Loic Dachary
896310c0b8 Merge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax
ceph.spec.in: fix _with_systemd conditional

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-25 21:40:22 +01:00
Gregory Farnum
97234c94ee Merge pull request #4182 from ceph/wip-replicatedpg-signed
ReplicatedPG: fix a signed/unsigned comparison warning

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-25 13:39:04 -07:00
Greg Farnum
e51761233e ReplicatedPG: fix a signed/unsigned comparison warning
This mismatch about whether pool IDs are signed or unsigned is
a persistent annoyance. I'm now casting the unsigned down to signed space
because apparently the OSD is using negative IDs for temporary object
namespaces.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-03-25 12:03:38 -07:00
Ken Dreyer
c5cf81dd91 ceph.spec.in: fix _with_systemd conditional
The RPM conditional needs a "?" in the event that it is not defined.
2015-03-25 12:16:03 -06:00
Greg Farnum
0c6bd2775f client: Hold on to exclusive caps on directories we "own"
If a directory is complete, we *really* want to keep the exclusive cap
so that we don't end up needing to do MDS lookup requests on every cache
miss.

Fixes: #11226

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-03-25 11:10:56 -07:00
Sage Weil
2724ce2d1b Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
2015-03-25 10:30:20 -07:00
Sage Weil
1b81d8c029 Merge pull request #3688 from XinzeChi/wip-clear-transaction
osd: new transcation if needed

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-25 10:28:25 -07:00
Sage Weil
cc3527a51e Merge pull request #3870 from majianpeng/cache-tier
Cache tier bug fixs

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:27:56 -07:00
Sage Weil
6748ff9522 Merge pull request #3679 from mslovy/wip-findObjectContext-opt
ReplicatedPG:: find_object_context clear extra creation (head,snapdir)

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:24:43 -07:00
Sage Weil
82d9153f01 Merge pull request #4065 from majianpeng/pgop-memleak
osd/ReplicatedPG: Fix a memory leak in do_pg_op.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:24:17 -07:00
Sage Weil
29d0d46db8 Merge pull request #3974 from majianpeng/fgetattr-fix
os/FileStore: For getxattr, enlarge the value size avoid try again.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:24:00 -07:00
Sage Weil
c639ce51ac Merge pull request #3604 from yghannam/yazen-testing
crc32c: add aarch64 optimized crc32c implementation

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:06:46 -07:00
Sage Weil
dca722ec7b Merge pull request #4073 from jdurgin/wip-lttng-daemon
common, global: use lttng ust functions for handling fork-like calls

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-25 10:06:13 -07:00
Danny Al-Gaaf
24aeb78bb0 Merge pull request #3916 from ceph/wip-rpm-no-ghost-socket-dir
ceph.spec.in: fix handling of /var/run/ceph

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-25 17:27:14 +01:00
Kefu Chai
8654b65740 Merge pull request #4000 from ceph/wip-da-SCA-20150312
Fixes for Covertity issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-26 00:12:35 +08:00
Samuel Just
6994648bc4 Merge pull request #4128 from dzafman/wip-11139-hammer
ceph-objectstore-tool: Use exit status 11 for incompatible import attemp...

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-25 08:29:31 -07:00