Yan, Zheng
4c24d0cc07
auth: reinitialize NSS modules after fork()
...
Fixes : #11128
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-21 01:08:11 +08:00
Yan, Zheng
f183cd7c21
auth: properly return error of cephx_calc_client_server_challenge
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-21 01:05:08 +08:00
Loic Dachary
fe25118b73
Merge pull request #4025 from ceph/wip-fix-configure-noversion
...
configure.ac: add --disable-gitversion
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-19 11:16:43 +01:00
Danny Al-Gaaf
cca067efde
configure.ac: add --disable-gitversion
...
During development each git commit cause currently a complete
rebuild of the source tree. By passing --disable-gitversion to
configure we set a generic version string for ceph to prevent
getting after each commit a new version set.
remove src/check_version and replace with a extended version
of src/make_version which allows detecting changes in .git_version
and ceph_ver.h to avoid not needed updates.
This change also forces to call make_version each time to make
sure that changes from configure or the NO_VERSION env variable
are processed.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-19 09:38:46 +01:00
Gregory Farnum
68d3637fea
Merge pull request #3951 from ceph/wip-cephfs-snaps
...
Wip cephfs snaps
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-18 14:31:51 -07:00
Josh Durgin
700a2ea400
Merge pull request #4072 from javierguerragiraldez/master
...
rados.py: fix Object.write() method
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-18 13:53:07 -07:00
Javier Guerra
d5d0aa332a
rados.py: fix Object.write() method
...
the file position should advance by the number of bytes written,
but the ioctx.write() function returns 0 on success
Signed-off-by: Javier Guerra <javier@guerrag.com>
2015-03-18 15:22:28 -05:00
Haomai Wang
9ad1b283dc
Merge pull request #4067 from ceph/wip-rbd-warning
...
tests: remove unused variable
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-19 00:44:48 +08:00
Josh Durgin
e54d57df15
tests: remove unused variable
...
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-03-18 09:18:24 -07:00
Yan, Zheng
2395ee1b24
mds: skip inode that is being puring when opening snap past parent
...
we can not increase reference count of purging inodes. purging
inodes have no snapshots, so it's OK to skip them.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 14:25:44 +08:00
Yan, Zheng
0dfab5d639
mds: don't crash MDS when snapshot data not found
...
When remote dentry and inode are in different snapshot realms.
The inode may not contain snapshot data for snapshot of the remote
dentry.
This issue are difficult to fix. This patch MDS print an error
instead of triggering assersion.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 14:25:44 +08:00
Yan, Zheng
1956e68231
mds: pick head inode when caps follows is zero
...
"caps follows is zero" means client does not flush anything, so
we shoud pick the head object
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 14:25:44 +08:00
Yan, Zheng
1bb4a9df60
mds: fix purging snapshotted stray inode
...
If stray inode has no snapshot data, it's OK to purge it even if
it's still referenced by some snapsthots. This is because seperate
snap inodes were created for snapshots.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 14:25:44 +08:00
Yan, Zheng
7f2ddf598e
mds: check snapset in journal_cow_dentry()
...
Removing snapshot also increases snaprealm's sequence number.
So only using snaprealm's sequence number to decide if we should
COW dentry is too loose. This patch makes journal_cow_dentry()
also check snaprealm's snapset.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 14:25:44 +08:00
Yan, Zheng
7ae66c495e
mds: fix fnode.snap_purged_thru check
...
We do not alway succeed in purging all stale snap dentries
(stale snap dentris can be in-use or have been trimmed from
cache). Updating fnode.snap_purged_thru prematurely will make
us not purge the remainning stale snap dentries. If CDir
has no cached snap dentry when fetching dirfrag, we can
guaranee that all stale snap dentries will be purged.
So we only update fnode.snap_purged_thru in this case.
Now the code that purges stale snap dentries is executed more
frequently. So this patch also make readdir not purge stale
snap dentries
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 14:12:50 +08:00
Yan, Zheng
635d792515
mds: purge stale snap data in CInode with snaprealm
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 14:12:34 +08:00
Yan, Zheng
142a99d7c4
mds: fix purging stale snapshot dentries
...
When fetching dirfrag, record stale snap dentries in CDir. So that
CDir::_omap_commit can remove these stale dentires from OMAP.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-03-18 13:59:36 +08:00
Josh Durgin
a53336accf
Merge pull request #3904 from yuyuyu101/wip-librbd-metadata
...
Wip librbd metadata
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-17 20:42:18 -07:00
Josh Durgin
c8c63f3c1f
Merge pull request #4013 from ceph/wip-5488
...
librbd: fix deadlock on image refresh
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-17 19:53:54 -07:00
Haomai Wang
b36482225a
Librbd: Add "start" and "max" arguments to metadata_list
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-18 10:52:27 +08:00
Ken Dreyer
641c472759
Merge pull request #3953 from wuxingyi/patch-2
...
rgw/logrotate.conf: Rename service name
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-03-17 20:51:40 -06:00
wuxingyi
9df3f79817
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>
2015-03-18 02:23:26 +00:00
Sage Weil
e1e37765f0
Merge pull request #4055 from vuhuong/wip-xio
...
XIO fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-17 16:24:33 -07:00
Sage Weil
be81637123
doc/release-notes: v0.67.11 draft notes
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-17 16:14:15 -07:00
Loic Dachary
a74223b174
Merge pull request #4045 from NTmatter/docs-raid4-removal
...
doc-rados-operations-crush-map: Swap Raid4 for Erasure
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-17 18:56:55 +01:00
Sage Weil
2a5ad8e3f7
Merge remote-tracking branch 'gh/hammer'
...
Conflicts:
src/gmock
src/msg/xio/XioPortal.h
2015-03-17 10:57:13 -07:00
Samuel Just
ec3a6d74a5
Merge pull request #3910 from athanatos/wip-11027
...
Wip 11027
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-17 10:28:56 -07:00
Samuel Just
773039d313
Merge pull request #3918 from tchaikov/hammer-fix-leaks-in-C_TwoContexts
...
osdc: fix a memory leak in C_TwoContexts
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-17 10:28:19 -07:00
Samuel Just
ad167fef54
Merge pull request #3972 from tchaikov/hammer-fix-msg-leak
...
osd: fix a msg leak
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-17 10:27:06 -07:00
Samuel Just
a6c685c805
Merge pull request #3994 from athanatos/wip-11069
...
PGLog: split divergent priors as well
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2015-03-17 10:15:46 -07:00
Thomas Johnson
87528c19a2
doc-rados-operations-crush-map: Swap Raid4 for Erasure
...
Signed-off-by: Thomas Johnson <NTmatter@gmail.com>
2015-03-17 17:32:24 +01:00
Yehuda Sadeh
b446fa11a3
Merge pull request #4001 from rzarzynski/wip-10650
...
rgw: send Last-Modified header in response for PUT on Swift's object.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-17 08:25:45 -07:00
Yehuda Sadeh
e35269e749
Merge pull request #3925 from rzarzynski/wip-11088
...
rgw: fix handling empty metadata items on Swift container.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-17 08:11:40 -07:00
Vu Pham
9f3f9efa1e
xio: Add xio_transport_type
...
Add xio_transport_type to control and run xio messenger over
rdma or tcp
Signed-off-by: Vu Pham <vu@mellanox.com>
2015-03-17 05:17:01 -07:00
Vu Pham
8b8a6f167c
xio: Update README.xio with dependencies
...
Signed-off-by: Vu Pham <vu@mellanox.com>
2015-03-17 05:13:57 -07:00
Loic Dachary
c87b655845
Merge pull request #4024 from ceph/wip-unused-var
...
mds: remove double-define on iterator
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-17 09:59:49 +01:00
John Spray
3fce475a82
mds: remove double-define on iterator
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-17 08:20:54 +00:00
Kefu Chai
34d7315658
Merge pull request #3976 from wonzhq/hit-set-check
...
osd/ReplicatePG: correctly checking if an object is in hit set
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-17 15:05:47 +08:00
Josh Durgin
015ed1b5b8
Merge pull request #4017 from ceph/wip-11125
...
rgw: update keystone cache with token info
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-16 18:27:12 -07:00
Loic Dachary
71a9571e22
Merge pull request #4019 from NTmatter/doc-typo-monap
...
doc/rados/operations/add-or-rm-mons: correcting minor typo
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-17 00:01:10 +01:00
Thomas Johnson
c60cd5bf35
doc/rados/operations/add-or-rm-mons: correcting minor typo
...
Signed-off-by: Thomas Johnson <NTmatter@gmail.com>
2015-03-16 23:54:29 +01:00
Samuel Just
bbe231a61f
PGLog: split divergent priors as well
...
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-16 14:34:03 -07:00
Yehuda Sadeh
6616294aa1
rgw: update keystone cache with token info
...
Fixes : #11125
Backport: hammer, firefly
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-16 13:43:10 -07:00
Sage Weil
1bea682169
Merge pull request #3997 from ceph/wip-debian-mv-var-lib-ceph-mds
...
debian: move /var/lib/ceph/mds to ceph-mds package
Reviewed-by: James Page <james.page@ubuntu.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-16 13:00:52 -07:00
Sage Weil
e219918a4f
Merge pull request #3945 from tchaikov/hammer-fix-xio-requeue
...
XIO: Handle requeue case of XIO messages
2015-03-16 12:50:49 -07:00
Sage Weil
ec2d8c9163
Merge pull request #3977 from tchaikov/fix-xio-loop-conn-cleanup
...
Fix XioLoopbackConnection Lifecycle.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-16 12:48:35 -07:00
Loic Dachary
0a76aa5e70
Merge pull request #3872 from dachary/wip-7334-partx-test
...
ceph-disk: test activate on the second journal
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2015-03-16 19:21:23 +01:00
Loic Dachary
332cf94632
Merge pull request #4014 from ceph/wip-mon-doc
...
doc/rados/operations/add-or-rm-mons: revise doc a bit to be less confusing
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-16 18:52:50 +01:00
John Spray
6417cf8b4e
Merge pull request #3922 from ceph/wip-11053
...
mds: fix assertion caused by system clock backwards
Reviewed-by: John Spray <john.spray@redhat.com>
2015-03-16 13:32:29 -04:00
John Spray
38cc0fc2de
Merge pull request #3752 from ceph/wip-10744
...
mds: give up replicas of a stopping mds's stuff
Reviewed-by: Yan, Zheng <zyan@redhat.com>
2015-03-16 13:06:49 -04:00