Commit Graph

11814 Commits

Author SHA1 Message Date
Sage Weil
44574e86bb mds: mark scatterlock stale if any auth dirfrags appear stale
The auth needs to move to MIX_STALE for the same reasons a replica does:
if, on scatter, any dirfrags have an old accounted_*stat, the lock needs to
be marked stale (or updated... TODO!).

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 21:51:15 -07:00
Sage Weil
4a0f731262 mds: do not update accounted_*stat if auth and frozen
The auth can't update a frozen dirfrag for the same reason a replica
can't.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 21:49:45 -07:00
Sage Weil
9d1984e803 mds: mark scatterlock stale if dir is frozen, not inode
It's the dir we're auth for and that might potentially be frozen.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 16:28:15 -07:00
Sage Weil
4838016dbc Merge branch 'unstable' into mix_stale 2010-11-02 16:25:37 -07:00
Sage Weil
e304a2451a rados: benchmark using unique object names
Include hostname and pid in object name, so that instances running on
different hosts write to unique objects.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 15:26:14 -07:00
Colin Patrick McCabe
38f96c658d debian packaging: set --sbindir=/sbin
We want mkcephfs and mount.ceph to be under /sbin.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-11-02 14:37:56 -07:00
Sage Weil
68f7fedea1 config: fix sigsegv handler
Fixed this with sigabrt, forgot to do sigsegv too.

See 7a688a9f99.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 13:00:26 -07:00
Sage Weil
235aa1c31f filestore: disable 'filestore btrfs snap' when SNAP_DESTROY is missing
We want to enable the new snap stuff by default.  But we also want to work
with the default configuration on old kernels.

The only downside here is that someone might explicitly enable it, only to
have it disabled on started because their kernel is old.  They'll get a
bright yellow warning in that case, at least.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 11:10:38 -07:00
Wido den Hollander
4cfd198cd9 Makefile.am: include the libcrush headers when installing
Signed-off-by: Wido den Hollander <wido@widodh.nl>
2010-11-02 10:43:18 -07:00
Greg Farnum
abb0b6d966 Merge branch 'testing' into unstable 2010-11-02 10:10:24 -07:00
Greg Farnum
5310ab6e10 uclient: Warn on truncate_[size|seq] changes for non-file inodes. 2010-11-02 10:09:41 -07:00
Greg Farnum
630db2a9ca mds: Init system CInodes to have a truncate_size of -1.
This should help with bug #518.
2010-11-02 10:09:33 -07:00
Sage Weil
524c890368 client: match initialization with mds
(see Server::prepare_new_inode())

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 10:09:22 -07:00
Sage Weil
20e8a4519d client: only do truncate on regular files
Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-02 10:09:15 -07:00
Wido den Hollander
905ff76352 debian: add pkg-config as build-depends
Signed-off-by: Wido den Hollander <wido@widodh.nl>
2010-11-02 09:45:14 -07:00
Sage Weil
bc9bc4cb28 init-ceph: make lockfile dir configuration (redhat)
Reported-by: Ed Burnette <ed.burnette@sas.com>
Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-01 22:09:56 -07:00
Colin Patrick McCabe
85ba4f2dbb object.h: const cleanup
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-11-01 19:31:11 -07:00
Sage Weil
3d85a7b9f0 logrotate: separate rule for stat/*.log
Logrotate seems to ignore the entire rule if any part of the file list
is not found.  This happens on nodes with only monitors.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-11-01 10:04:15 -07:00
Colin Patrick McCabe
49153c2cb4 osd::PG: Update PG comments
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-11-01 09:53:18 -07:00
Colin Patrick McCabe
e6df8074f3 test: create test_unfound.sh
Create test_unfound.sh to test handling unfound objects.

Move more test functions into test/test_common.sh to facilitate code
reuse.

Allow the user to keep the temporary directory around after the test is
over by setting KEEP_TEMPDIR.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-11-01 09:50:08 -07:00
Colin Patrick McCabe
1dd5042e65 fix make distcheck, make uninstall
Make distclean was failing because make uninstall was broken. (There were
still leftover files after running make install + make uninstall.)

To fix this, use automake's built-in installation mechanisms rather than
manually installing files using the install-data-local target.

EXTRA_DIST: fix paths to use srcdir where necessary

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-31 20:43:39 -07:00
Sage Weil
33e4d53346 Merge remote branch 'origin/mds_frags' into unstable 2010-10-30 15:46:03 -07:00
Sage Weil
6c69c25923 Merge remote branch 'origin/testing' into unstable
Conflicts:
	configure.ac
2010-10-30 15:04:13 -07:00
Sage Weil
c044829c47 filestore: automatically choose appropriate journaling mode
The three modes each get an explicit config option that defaults to false.
You can choose one explicitly by enabling one of those.  Otherwise, we
will choose an appropriate mode automatically based on detected btrfs
ioctls.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-30 15:22:09 -07:00
Sage Weil
9f4fd4a6d9 v0.22.2 2010-10-30 11:24:34 -07:00
Sage Weil
5b06ca1c77 filestore: use updated btrfs ioctls
Switch to the interface finally merged for 2.6.37-rc1.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-30 11:12:14 -07:00
Sage Weil
a831b2aa61 btrfs: update ioctls.h
This is what was finally merged for 2.6.37-rc1.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-30 10:32:18 -07:00
Colin Patrick McCabe
bb628d382b Get "make dist" working, fix gui build issues
* Fix VPATH builds (i.e., builds where srcdir != builddir).
Don't assume that we can get a source files named blah with ./blah.
Use $(srcdir)/blah instead.

* When doing "make dist", inject the .git_version file directly into the
ceph tarball

* Add tools/gui_resources.h to noinst_HEADERS

* Add ceph_tool_gui_DATA to all_sources

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-29 17:04:28 -07:00
Sage Weil
7e8fc103dd mds: detect small dirs that should be merged, and merge them
Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 16:42:16 -07:00
Sage Weil
8a8e37b8d4 mds: hit dir popularity on unlink
Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 15:47:43 -07:00
Sage Weil
73c6e4cca7 osd: write potentially large pg info to object, not xattr [format change]
Write past_intervals and snap_collections to a separate object instead of
an attr on the collection directory.  This avoids exceeding the underlying
filesystem xattr limits during thrashing recovery.  The struct_v on the
small info xattr is used to indicate the format of the biginfo object.

Also fixed pg deletion to clean out log and biginfo objects.

Added incompat format flag.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 15:29:16 -07:00
Colin Patrick McCabe
ed89d9a2c1 cephtool-gui : more helpful error on pixbuf fail
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-29 14:36:47 -07:00
Sage Weil
18bb14ea3f osd: snap_trimmer: flush between collection sets
We need to make sure the objects whose collection sets we just adjusted
are reflected on disk when we make the next pass on the next snapid.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 14:06:46 -07:00
Sage Weil
440cc43956 mds: auth_pin head/snap pairs for all need_snapflush entries
This ensures that when snap metadata is flushed, we will be auth on both
inodes and be able to do the update properly.  This isn't the nicest
solution ever, since it can make migrations laggy, but it's the simplest.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 13:07:19 -07:00
Sage Weil
0ce1d509b3 mds: Refactor need_snapflush into CInode helpers
Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 13:07:19 -07:00
Colin Patrick McCabe
9f86a79d71 configure.ac: default to --enable-gtk
Default to enabling gtk rather than disabling it. Gracefully handle
cases where the user tries to enable it but it cannot be enabled.

Makefile.am: Add missing headers to noinst_HEADERS.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-29 12:40:15 -07:00
Sage Weil
c2045286ca osd: fix decoding of legacy (v2) coll_t
It was u8, not int.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 12:06:44 -07:00
Sage Weil
96e583d375 mds: use list instead of vector for trim_unlinked_inodes
Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 11:42:14 -07:00
Sage Weil
4e180fef33 mds: fix use-after-free iterator no-no in remove_inode_recursive()
We can't close_dirfrag and use the iterator if it's pointing to the
released element.

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 11:42:14 -07:00
Greg Farnum
8906819ae0 Merge branch 'mds_journal' into unstable 2010-10-29 11:30:51 -07:00
Greg Farnum
aa83e11c67 mds: log if trim_non_auth does anything, since it shouldn't
be now except on rollbacks.
2010-10-29 11:29:19 -07:00
Greg Farnum
404c83e3e5 mds: Call trim_non_auth_subtree when appropriate. 2010-10-29 11:29:18 -07:00
Greg Farnum
207452180b mds: add function MDCache::trim_non_auth_subtree
Trims the subtree rooted at the given dir from cache, except
for those portions linking to directories on other MDSes.
Meant for use during replay.
2010-10-29 11:29:14 -07:00
Sage Weil
8255a6716f debian: fix changelog
(This was actually in the 0.22.1-1 package we built.)

Signed-off-by: Sage Weil <sage@newdream.net>
2010-10-29 10:48:40 -07:00
Colin Patrick McCabe
ba6d931b4d Mutex: add more checks to lockdep
When lockdep is enabled, use PTHREAD_MUTEX_ERRORCHECK instead of
PTHREAD_MUTEX_NORMAL for non-recursive mutexes.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-28 16:46:45 -07:00
Colin Patrick McCabe
7f90cc27f8 ceph: gui: update copyright foo
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-28 15:51:19 -07:00
Colin Patrick McCabe
329fbc240d cephtool: gui: handle bad input in view_node
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-28 15:51:19 -07:00
Colin Patrick McCabe
89273b7fe0 cephtool: only initialize the tokenizer once
Only initialize the tokenizer once. It gets cranky if it we call
tok_init more than once.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-28 15:51:19 -07:00
Colin Patrick McCabe
819ad635ac cephtool: fix initialization race
Call GuiMonitor::link_elements before GuiMonitor::connect_signals.

It doesn't seem safe to set up callbacks before the GUI elements are
fully initialized.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-28 15:51:19 -07:00
Colin Patrick McCabe
c13183e7db cephtool: join GUI thread before shutting down
Join GUI thread before shutting down.

Move open_icon function.

Delete unused get_widgets function.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
2010-10-28 15:51:19 -07:00