Sam Lang
f1e67d5ccc
Merge branch 'wip-java-test'
2012-11-09 13:52:07 -06:00
Joe Buck
5ef16edbc3
test.sh: Adding LD_LIBRARY_PATH so JUnit can find .so files.
...
Removing useless java.library.path references.
Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-09 11:43:11 -08:00
Samuel Just
9e9feffa2e
doc/cluster-ops/pools.rst: Added documentation for min_size
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-09 11:34:54 -08:00
Sage Weil
b5ce4d0ed7
client: fix SnapRealm leak
...
Start ref count at 0; get_snap_realm() will increment it after alloc.
Fix the ref drop order so that the xlist is empty.
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 10:12:21 -08:00
Sage Weil
56a152b1f2
client: debug SnapRealm reference counting
...
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 10:09:53 -08:00
Noah Watkins
a34a9af060
vstart: allow minimum pool size of one
...
A minimum pool size of 2 was introduced by 13486857cf
. This sets the
minimum to one so that basic vstart environments work.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2012-11-09 10:08:36 -08:00
Sage Weil
88cdde37d1
client: fix leak of Cap
...
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 10:02:59 -08:00
Sage Weil
5e564f9b7f
client: fix leak of session release msg on session close
...
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 10:01:48 -08:00
Sage Weil
c352edd328
client: only start invalidator thread if cb != NULL
...
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 09:59:39 -08:00
Sage Weil
44a7017868
ceph-fuse: deallocate messenger, g_ceph_context on stop
...
This lets us use valgrind to find leaks.
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 09:52:08 -08:00
Joao Eduardo Luis
fe6e4265f2
doc: add-or-rm-mons.rst: fix a formatting typo
...
(also forgot the John's reviewed-by on the last commit)
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: John Wilkins <john.wilkins@inktank.com>
2012-11-09 17:36:50 +00:00
Joao Eduardo Luis
5b32664aad
doc: add-or-rm-mons.rst: make paths clearer
...
Some users have been incurring into problems adding new monitors while
following these steps. Some of these problems are due to the meaning of
'{path}' being a bit ambiguous. This patch removes said ambiguity by
replacing '{path}' with '{tmp}', supposed to be a temporary directory
containing the files necessary to add the monitor (monmap and keyring).
Fixes : #3438 #3463
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2012-11-09 17:12:11 +00:00
Sage Weil
66e6a63608
client: give get_caps() out-arg a less confusing name
...
No functional change.
Call this arg "have" and not "got", since we only take a ref on what we
need.
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 07:38:42 -08:00
Sage Weil
ad4bd4e23e
client: do not gratuitously drop FILE_CACHE ref in _read()
...
The get_caps() had a confusing out-arg called "got" that is really what
caps we *have*; it only takes a ref on the *need* cap. We should only
put that one explicitly (CEPH_CAP_FILE_RD). The _write() method already
does this properly, but _read() did not.
Fixes : #3470
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 07:38:42 -08:00
Sage Weil
128fed8e17
client: assert cap refs don't go negative
...
This is the root cause of #3470 .
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-09 07:38:42 -08:00
Dan Mick
e90433855e
Merge branch 'next'
2012-11-08 19:28:38 -08:00
Josh Durgin
dc907e28cf
librbd: take parent lock when examining fields it protects
...
This hasn't actually caused any problems, I just noticed
while looking through the code.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-08 17:25:45 -08:00
Yehuda Sadeh
1ba969b180
Merge remote-tracking branch 'origin/wip-swift-token' into wip-rgw-integration
2012-11-08 17:24:53 -08:00
Samuel Just
a183fe7404
OSDMap.cc: Add pool name to OSDMap dump
...
Otherwise, we can't use ceph osd dump --format=json to map pool name
onto pool id.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-08 17:22:31 -08:00
Yehuda Sadeh
2475d0143b
Merge branch 'wip-keystone' into wip-rgw-integration
...
Conflicts:
debian/control
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 17:19:18 -08:00
Yehuda Sadeh
e5124ced11
Merge branch 'wip-post-cleaned' into wip-rgw-integration
...
Conflicts:
src/rgw/rgw_common.cc
src/rgw/rgw_op.cc
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 17:17:43 -08:00
Dan Mick
faf23caa6a
rbd: fix snap unprotect, which was succeeding while clones existed
...
1) use right snap id when forming parent spec to search for children
2) add test case for "unprotect with extant children"
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2012-11-08 17:14:22 -08:00
Yehuda Sadeh
b2d4c491c7
Merge branch 'wip-3453' into wip-rgw-integration
2012-11-08 17:07:16 -08:00
Yehuda Sadeh
f89efc9f47
Merge branch 'wip-3452' into wip-rgw-integration
2012-11-08 17:07:12 -08:00
Yehuda Sadeh
b4a2fe4619
Merge branch 'wip-stripe'
...
Conflicts:
src/common/config_opts.h
src/rgw/rgw_op.cc
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 17:03:13 -08:00
Josh Durgin
77b42375b2
librbd: no need to scan snapshots for parents during remove
...
At this point we already know no snapshots exist.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-08 16:57:12 -08:00
tamil
c45a415ced
script clean up
...
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2012-11-08 16:06:04 -08:00
tamil
9ea95a0e0b
Added a function get_cmd_op
...
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2012-11-08 15:53:28 -08:00
Yehuda Sadeh
fc0d6d3453
docs: add keystone documentation
...
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:30 -08:00
Yehuda Sadeh
5fda39e6a3
rgw: change configurable
...
rgw keystone accepted roles
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:30 -08:00
Yehuda Sadeh
a99b0fac88
rgw: fix build
...
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:30 -08:00
Yehuda Sadeh
8fcd35185a
rgw: use a different boost thread library
...
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:29 -08:00
Yehuda Sadeh
ff8c2380b3
rgw: keystone tokens revocation thread
...
Use a thread to invalidate revoked tokens.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:29 -08:00
Yehuda Sadeh
b69da4b8db
json_spirit: thread safe
...
apparently the library is not thread safe by default.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:29 -08:00
Yehuda Sadeh
feb24afb63
rgw: decode pki tokens
...
If we can decode pki tokens then we don't need to send them to
the Keystone server for verification.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:29 -08:00
Yehuda Sadeh
02c2c32dcf
rgw: invalidate revoked tokens
...
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:29 -08:00
Yehuda Sadeh
1f05b1af6e
rgw: keep pki tokens by hash
...
and also fix the token parsing (needed after the json
parser fix).
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:29 -08:00
Yehuda Sadeh
8249d7b3fb
rgw: decode revocation message
...
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:20 -08:00
Sylvain Munaut
0d164dace9
rgw: use thread safe version of gmtime
...
Use gmtime_r instead of gmtime.
Signed-off-by: Sylvain Munaut <s.munaut@whatever-company.com>
2012-11-08 13:13:15 -08:00
Gary Lowell
ff5ee98f1c
build: Add RPM release string generated from git describe.
...
Fix for bug 3451. Use the commit count and sha1 from git describe to
construct a release string for rpm packages.
2012-11-08 12:43:24 -08:00
John Wilkins
8db7d2c436
Merge branch 'master' of https://github.com/ceph/ceph
2012-11-08 11:59:30 -08:00
John Wilkins
82ebbaba31
doc: Clarified text to reflect requirement for majority, not odd number of monitors.
...
fixes: 3464
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-08 11:59:15 -08:00
Sage Weil
8daecaf972
Merge remote-tracking branch 'gh/wip-fix-symlinks'
...
Conflicts:
qa/qa_scripts/load-bucket-1000-obj.pl
src/test/libcephfs/test.cc
2012-11-08 11:45:01 -08:00
Sage Weil
9dcc8a3b2e
Merge remote-tracking branch 'gh/wip-mds'
2012-11-08 11:40:36 -08:00
Gary Lowell
a39110db47
ceph.spec.in: Remove ceph version requirement from ceph-fuse package.
...
The ceph-fuse rpm package now only requires ceph as a pre-req, not a specific
version.
2012-11-08 09:39:59 -08:00
caleb miles
e37c19285a
rgw_admin: do not throw error when start-date and end-date are not
...
passed to usage::trim()
Signed-off-by: caleb miles <caleb.miles@inktank.com>
2012-11-08 09:31:30 -08:00
Joe Buck
b7da8bbe7f
libcephfs_jni.cc: mtime and atime are Long data types. Changing the accessor methods to
...
reflect this fact
Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:56 -08:00
Noah Watkins
1581db9bcb
configure: fail when missing junit dependency
...
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:26 -08:00
Noah Watkins
a47a96619c
Makefile: include Java test suite artifacts
...
Automake has problems handling the naming convention used by Java for
inner classes (x$y.class).
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:26 -08:00
Noah Watkins
2dfc1030d7
Makefile: include Java unit test runner
...
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:26 -08:00