Commit Graph

22234 Commits

Author SHA1 Message Date
Sage Weil
ae1f46c3b5 mds: re-try_set_loner() after doing evals in eval(CInode*, int mask)
Consider a case where current loner is A and wanted loner is B.
At the top of the function we try to set the loner, but that may fail
because we haven't processed the gathered caps yet for the previous
loner.  In the body we do that and potentially drop the old loner, but we
do not try_set_loner() again on the desired loner.

Try after our drop.  If it succeeds, loop through the eval's one more time
so that we can issue caps approriately.

This fixes a hang induced by a simple loop like:

 while true ; do echo asdf >> mnt.a/foo ; tail mnt.b/foo ; done &
 while true ; do ls mnt.a mnt.b ; done

(The second loop may not be necessary.)

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-10 01:38:15 -08:00
Dan Mick
4b94e83fc9 Merge branch 'next'
Pull in types.h fix
2012-11-09 19:35:12 -08:00
Dan Mick
07b4f8fa0a si_t was not properly converting values < 100KB
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2012-11-09 19:26:42 -08:00
tamil
0cfe6320a8 cleaned up scripts
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2012-11-09 17:55:32 -08:00
Gary Lowell
1c9ec26eea ceph.spec.in: Build debuginfo subpackage.
This is a partial fix for bug 3471.  Enable building of debuginfo package.
Some distributions enable this automatically by installing additional rpm
macros, on others it needs to be explicity added to the spec file.
2012-11-09 13:28:13 -08:00
Josh Durgin
de2cd18c3d test: add cli test for missing args to rbd
This includes 'rbd mv foo', which used to crash

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-09 12:17:50 -08:00
Josh Durgin
34ebda2bab rbd: check for second argument to mv/rename
Without this check, 'rbd mv foo' crashed trying to use a NULL char* as
a string.

Reported-by: Andrey Korolyov <andrey@xdel.ru>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-09 12:17:50 -08:00
Josh Durgin
9aae0eeaa7 rbd: check for second argument to mv/rename
Without this check, 'rbd mv foo' crashed trying to use a NULL char* as
a string.

Reported-by: Andrey Korolyov <andrey@xdel.ru>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-09 12:11:20 -08:00
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
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
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
Dan Mick
e90433855e Merge branch 'next' 2012-11-08 19:28:38 -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
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
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
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
Noah Watkins
55483d78bc Makefile: only add source files to EXTRA_DIST
Prevents a make dist on a built tree from including the compiled
bytecode files produced from compiling the Java tests.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:26 -08:00
Noah Watkins
74cc2992c7 Makefile: use real file for make target
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:26 -08:00
Noah Watkins
4f215b0c7e Makefile: remove redundant EXTRA_DIST
Already set at the beginning of the Makefile.am

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:26 -08:00
Joe Buck
c3129a2780 Changing build.xml to produce a jar instead of class files Adding a
TestSuite class to run all tests
Remove the libcephfs-test.jar when running ant clean

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:23 -08:00
Joe Buck
77015424f8 Adding libcephfs-java.jar to .gitignore
Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:28:01 -08:00
Joe Buck
791a8224f0 Adding a simple workunit that executes one libcephfs-java test
Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:27:52 -08:00
Joe Buck
5dec9172d9 Moving test java files into a proper heirarchy. Moving the compilation
of tests classes from build.xml to Makefile and editing configure.ac to
look for the junit4 jar in the default location of /usr/share/java. It
is still possible to build and run tests from build.xml as well as
Makefile.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 09:27:49 -08:00
Noah Watkins
08ee7364bc java: fix return type on JNI function
Return value of declaration was is a JNI specific jlong type, while a
the return type of the definition was long. g++ not happy.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-08 07:53:09 -08:00
Sage Weil
b1b9f0a44d vstart.sh: allow shorter MON, OSD, MDS count env vars
This will save me some typing.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-08 06:56:57 -08:00
Sage Weil
8ccccbbfee osdmap: make flag names match
It's 'ceph osd set noup', so make the flag name 'noup', to avoid any
confusion.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-08 06:56:57 -08:00
Sage Weil
f2bf7aa773 mon: make osdmap flags incur a health warning
This will ensure that users will see a health warning when, for instance,
NOUP or PAUSE[RD|WR|EXEC] flags are set.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-08 06:56:56 -08:00
John Wilkins
937345219d doc: Rewrote index for install section per new IA.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:42:41 -08:00
John Wilkins
f2fbe7a74d doc: Removed source/index from top-level toc tree per new IA.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:42:12 -08:00
John Wilkins
6f6df5c2ef doc: Moved doc/source files to doc/install per new IA.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:41:35 -08:00
John Wilkins
059294cecc doc: Syntax cleanup for new IA. Fix tip. Clean up for generating keys.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:19:19 -08:00
John Wilkins
631075d8c1 doc: Syntax cleanup for new IA. Added reference to repo.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:18:06 -08:00
John Wilkins
7a1e952b87 doc: Syntax cleanup for new IA.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:17:46 -08:00
John Wilkins
e11cafb578 doc: Syntax cleanup for new IA. Removed steps for building docs.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:17:31 -08:00
John Wilkins
b5ae387e01 doc: Syntax cleanup for new IA. Removed info for building documentation.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:16:50 -08:00
John Wilkins
9eb0b2b9a8 doc: Syntax cleanup for new IA.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-07 22:16:10 -08:00