last_committed_seq is the last seq committed to the fs, not the journal.
Set it when we begin replay with the fs provided value, not from the newest
entry in the journal.
Signed-off-by: Sage Weil <sage@newdream.net>
Looks like this was missed when flocklock was added. Did a quick grep and
it doesn't look like it is missing anywhere else.
Signed-off-by: Sage Weil <sage@newdream.net>
Otherwise we don't actually journal this value, and we get confused when
we replay a start_truncate and try to restart it.
Fixes: #1756
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
If an address isn't explicitly specified during mkfs, look for an unnamed
monitor in the (generated) monmap and see if any of those addresses is
configured on the local machine. If so, assume it's us, and name ourselves
in the seed monmap.
Signed-off-by: Sage Weil <sage@newdream.net>
Previously, the overlaps for snapdirs would not be included in
cstat causing the computed total to be incorrect.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Previously, we accounted for clone space usage inconsistently in
write_update_size_and_usage etc when walking through the operations.
make_writeable may change the most recent clone overlap, however, so we
can't handle it until then.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Shut down MonClient before messenger, to avoid race with MonClient::tick()
and MonClient::shutdown().
Fixes
#0 __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:136
#1 0x00007f44475e2849 in _L_lock_953 () from /lib/libpthread.so.0
#2 0x00007f44475e266b in __pthread_mutex_lock (mutex=0x14d8dc8) at pthread_mutex_lock.c:61
#3 0x00000000005ae090 in Mutex::Lock (this=0x14d8db8, no_lockdep=false) at ./common/Mutex.h:108
#4 0x000000000068440e in MonClient::shutdown (this=0x14d8c30) at mon/MonClient.cc:386
#5 0x00000000005b2653 in ceph_tool_common_shutdown (ctx=0x14d84c0) at tools/common.cc:661
#6 0x00000000005ada29 in main (argc=7, argv=0x7fff8a2394c8) at tools/ceph.cc:304
vs
#0 0x00007f44475e8a0b in raise (sig=<value optimized out>) at ../nptl/sysdeps/unix/sysv/linux/pt-raise.c:42
#1 0x00000000005eff6b in reraise_fatal (signum=11) at global/signal_handler.cc:59
#2 0x00000000005f0165 in handle_fatal_signal (signum=11) at global/signal_handler.cc:106
#3 <signal handler called>
#4 0x0000000000000000 in ?? ()
#5 0x000000000068661a in MonClient::tick (this=0x14d8c30) at mon/MonClient.cc:621
#6 0x0000000000689e3b in MonClient::C_Tick::finish(int) ()
#7 0x000000000061b3c5 in SafeTimer::timer_thread (this=0x14d8df8) at common/Timer.cc:102
#8 0x000000000061c6f0 in SafeTimerThread::entry() ()
#9 0x00000000005f1219 in Thread::_entry_func (arg=0x14e1a00) at common/Thread.cc:41
#10 0x00007f44475e0971 in start_thread (arg=<value optimized out>) at pthread_create.c:304
#11 0x00007f4445ead92d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:112
#12 0x0000000000000000 in ?? ()
Signed-off-by: Sage Weil <sage@newdream.net>
Different sockaddr_* have the actual address (sin_addr, sin6_addr)
at different offsets, and sockaddr->sa_data just isn't enough.
inet_ntop conspires by taking a void*. I could figure out the right
offset with a switch (found->sa_family), but let's go for the
supposedly write-once-run-with-any-AF solution, getnameinfo.
Which, naturally, takes an extra length argument that is AF-specific,
and not provided anywhere nicely by getifaddrs. Huzzah!
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
The election and some other stuff depend on msg->get_source().num() to get
the peer rank, and that is part of the connection state. If it changes,
we need to close old connections and open new ones so that we aren't
taken for someone else (like mon.-1).
Signed-off-by: Sage Weil <sage@newdream.net>
The rank can change either because we probe and get a new monmap, or
because we get one via paxos. Move the checks to bootstrap() to catch
both cases.
Signed-off-by: Sage Weil <sage@newdream.net>
If we are joining an existing cluster, we can pick whatever address we
want (e.g., one specified by public_addr or public_network).
Signed-off-by: Sage Weil <sage@newdream.net>
Because we have called osr.flush(), it's safe to tag map.valid_through
as last_update. We will still have to catch up once we have stopped
writes and allowed the filestore to catch up anyway.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Instead of specifying an IP address in ceph.conf like
[global]
cluster_addr = 10.1.2.3
you can now avoid the node-specific configuration and just say
[global]
cluster_network = 10.1.2.0/24
The *_network variables can also take a whitespace-separated list of
networks, to be checked in that order:
[global]
cluster_network = 10.1.2.0/24 192.168.42.192/26
pending_ops was protected by osd_lock, but it tracks something in the
queue, which has it's own lock. Messy. Also, useless, since
wait_for_no_ops had a single caller in shutdown() that op_wq.drain() can
do for us.
Rip it out, and track queue size under the queue lock.
Fixes: #1727
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
The op queue is shut down, so this is mostly safe, unless someone comes
through and does requeue_ops() from a callback or something.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
This can happen when multiple C_Active events are queued, and the first
does a propose_pending() (moving us into updating state).
Signed-off-by: Sage Weil <sage@newdream.net>
We can learn either an uncommitted or committed value during the
collect/last recovery phase. For the committed values, we need to remember
each peer's first/last_committed and share only at the end to avoid a
situation like:
- mon.1 has same last_committed as us
- mon.2 has newer last_commited, we save it
- mon.3 has same last_commited as mon.1, we share new value
- done... but mon.1 never got mon.2's newer commit.
Instead, save the commit sharing until the collect process completes, so
we know that any committed value learned from anyone is shared with
everyone who needs it.
This fixes a crash like
mon/Paxos.cc: In function 'void Paxos::handle_begin(MMonPaxos*)', in thread '7fd91192c700'
mon/Paxos.cc: 400: FAILED assert(begin->last_committed == last_committed)
ceph version 0.38-208-g9aabd39 (commit:9aabd3982cceb7e8489412b4bfbb4c2387880de2)
1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x76) [0x72454e]
2: (Paxos::handle_begin(MMonPaxos*)+0x363) [0x6499ef]
3: (Paxos::dispatch(PaxosServiceMessage*)+0x2b4) [0x64db2c]
4: (Monitor::_ms_dispatch(Message*)+0xdc6) [0x6205c2]
5: (Monitor::ms_dispatch(Message*)+0x3a) [0x62831a]
6: (Messenger::ms_deliver_dispatch(Message*)+0x63) [0x7d1f31]
7: (SimpleMessenger::dispatch_entry()+0x7c2) [0x7bb786]
8: (SimpleMessenger::DispatchThread::entry()+0x2c) [0x6070fa]
9: (Thread::_entry_func(void*)+0x23) [0x6f3f69]
10: (()+0x7971) [0x7fd9153a1971]
11: (clone()+0x6d) [0x7fd913c3092d]
Signed-off-by: Sage Weil <sage@newdream.net>
