Skip to content

Commit cd918fb

Browse files
feature: support graceful shutdown
If connected to Tarantool 2.10 or newer and WatchersFeature is required, after this patch connection supports server graceful shutdown [1]. In this case, server will wait until all client requests will be finished and client disconnects before going down (server also may go down by timeout). Client reconnect will happen if connection options enable reconnect. 1. https://www.tarantool.io/en/doc/latest/dev_guide/internals/iproto/graceful_shutdown/ Closes #214
1 parent 03a1cc1 commit cd918fb

File tree

4 files changed

+566
-14
lines changed

4 files changed

+566
-14
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
1515
- Error type support in MessagePack (#209)
1616
- Event subscription support (#119)
1717
- Session settings support (#215)
18+
- Support graceful shutdown (#214)
1819

1920
### Changed
2021

connection.go

+138-14
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@ const ignoreStreamId = 0
2525
const (
2626
connDisconnected = 0
2727
connConnected = 1
28-
connClosed = 2
28+
connShutdown = 2
29+
connClosed = 3
2930
)
3031

3132
const (
3233
connTransportNone = ""
3334
connTransportSsl = "ssl"
3435
)
3536

37+
const shutdownEventKey = "box.shutdown"
38+
3639
type ConnEventKind int
3740
type ConnLogKind int
3841

@@ -45,6 +48,8 @@ const (
4548
ReconnectFailed
4649
// Either reconnect attempts exhausted, or explicit Close is called.
4750
Closed
51+
// Shutdown signals that shutdown callback is processing.
52+
Shutdown
4853

4954
// LogReconnectFailed is logged when reconnect attempt failed.
5055
LogReconnectFailed ConnLogKind = iota + 1
@@ -134,10 +139,19 @@ func (d defaultLogger) Report(event ConnLogKind, conn *Connection, v ...interfac
134139
// always returns array of array (array of tuples for space related methods).
135140
// For Eval* and Call* Tarantool always returns array, but does not forces
136141
// array of arrays.
142+
//
143+
// If connected to Tarantool 2.10 or newer and WatchersFeature is required,
144+
// connection supports server graceful shutdown. In this case, server will
145+
// wait until all client requests will be finished and client disconnects
146+
// before going down (server also may go down by timeout). Client reconnect will
147+
// happen if connection options enable reconnect.
148+
//
149+
// More on graceful shutdown: https://www.tarantool.io/en/doc/latest/dev_guide/internals/iproto/graceful_shutdown/
137150
type Connection struct {
138151
addr string
139152
c net.Conn
140153
mutex sync.Mutex
154+
cond *sync.Cond
141155
// Schema contains schema loaded on connection.
142156
Schema *Schema
143157
// requestId contains the last request ID for requests with nil context.
@@ -162,6 +176,11 @@ type Connection struct {
162176
serverProtocolInfo ProtocolInfo
163177
// watchMap is a map of key -> chan watchState.
164178
watchMap sync.Map
179+
180+
// shutdownWatcher is the "box.shutdown" event watcher.
181+
shutdownWatcher Watcher
182+
// requestCnt is a counter of active requests.
183+
requestCnt uint32
165184
}
166185

167186
var _ = Connector(&Connection{}) // Check compatibility with connector interface.
@@ -385,6 +404,8 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
385404
conn.opts.Logger = defaultLogger{}
386405
}
387406

407+
conn.cond = sync.NewCond(&conn.mutex)
408+
388409
if err = conn.createConnection(false); err != nil {
389410
ter, ok := err.(Error)
390411
if conn.opts.Reconnect <= 0 {
@@ -421,6 +442,16 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
421442
}
422443
}
423444

445+
// Subscribe shutdown event to process graceful shutdown.
446+
if conn.isWatchersRequired() {
447+
watcher, werr := conn.NewWatcher(shutdownEventKey, shutdownEventCallback)
448+
if werr != nil {
449+
conn.closeConnection(werr, true)
450+
return nil, werr
451+
}
452+
conn.shutdownWatcher = watcher
453+
}
454+
424455
return conn, err
425456
}
426457

@@ -589,6 +620,7 @@ func (conn *Connection) dial() (err error) {
589620
conn.lockShards()
590621
conn.c = connection
591622
atomic.StoreUint32(&conn.state, connConnected)
623+
conn.cond.Broadcast()
592624
conn.unlockShards()
593625
go conn.writer(w, connection)
594626
go conn.reader(r, connection)
@@ -762,10 +794,19 @@ func (conn *Connection) closeConnection(neterr error, forever bool) (err error)
762794
if conn.state != connClosed {
763795
close(conn.control)
764796
atomic.StoreUint32(&conn.state, connClosed)
797+
conn.cond.Broadcast()
798+
// Free the resources.
799+
if conn.shutdownWatcher != nil {
800+
conn.mutex.Unlock()
801+
conn.shutdownWatcher.Unregister()
802+
conn.shutdownWatcher = nil
803+
conn.mutex.Lock()
804+
}
765805
conn.notify(Closed)
766806
}
767807
} else {
768808
atomic.StoreUint32(&conn.state, connDisconnected)
809+
conn.cond.Broadcast()
769810
conn.notify(Disconnected)
770811
}
771812
if conn.c != nil {
@@ -784,9 +825,7 @@ func (conn *Connection) closeConnection(neterr error, forever bool) (err error)
784825
return
785826
}
786827

787-
func (conn *Connection) reconnect(neterr error, c net.Conn) {
788-
conn.mutex.Lock()
789-
defer conn.mutex.Unlock()
828+
func (conn *Connection) reconnectImpl(neterr error, c net.Conn) {
790829
if conn.opts.Reconnect > 0 {
791830
if c == conn.c {
792831
conn.closeConnection(neterr, false)
@@ -799,6 +838,13 @@ func (conn *Connection) reconnect(neterr error, c net.Conn) {
799838
}
800839
}
801840

841+
func (conn *Connection) reconnect(neterr error, c net.Conn) {
842+
conn.mutex.Lock()
843+
defer conn.mutex.Unlock()
844+
conn.reconnectImpl(neterr, c)
845+
conn.cond.Broadcast()
846+
}
847+
802848
func (conn *Connection) lockShards() {
803849
for i := range conn.shard {
804850
conn.shard[i].rmut.Lock()
@@ -1026,6 +1072,15 @@ func (conn *Connection) newFuture(ctx context.Context) (fut *Future) {
10261072
fut.done = nil
10271073
shard.rmut.Unlock()
10281074
return
1075+
case connShutdown:
1076+
fut.err = ClientError{
1077+
ErrConnectionShutdown,
1078+
"server shutdown in progress",
1079+
}
1080+
fut.ready = nil
1081+
fut.done = nil
1082+
shard.rmut.Unlock()
1083+
return
10291084
}
10301085
pos := (fut.requestId / conn.opts.Concurrency) & (requestsMap - 1)
10311086
if ctx != nil {
@@ -1086,6 +1141,7 @@ func (conn *Connection) send(req Request, streamId uint64) *Future {
10861141
if fut.ready == nil {
10871142
return fut
10881143
}
1144+
10891145
if req.Ctx() != nil {
10901146
select {
10911147
case <-req.Ctx().Done():
@@ -1094,10 +1150,17 @@ func (conn *Connection) send(req Request, streamId uint64) *Future {
10941150
default:
10951151
}
10961152
}
1153+
1154+
if conn.shutdownWatcher != nil {
1155+
atomic.AddUint32(&(conn.requestCnt), uint32(1))
1156+
}
1157+
10971158
conn.putFuture(fut, req, streamId)
1159+
10981160
if req.Ctx() != nil {
10991161
go conn.contextWatchdog(fut, req.Ctx())
11001162
}
1163+
11011164
return fut
11021165
}
11031166

@@ -1164,6 +1227,15 @@ func (conn *Connection) markDone(fut *Future) {
11641227
if conn.rlimit != nil {
11651228
<-conn.rlimit
11661229
}
1230+
1231+
if conn.shutdownWatcher != nil {
1232+
// This is a real advice from Go documentation
1233+
// about how to decrement atomic uint32.
1234+
// https://pkg.go.dev/sync/atomic#AddUint32
1235+
if atomic.AddUint32(&(conn.requestCnt), ^uint32(0)) == 0 {
1236+
conn.cond.Broadcast()
1237+
}
1238+
}
11671239
}
11681240

11691241
func (conn *Connection) peekFuture(reqid uint32) (fut *Future) {
@@ -1458,6 +1530,15 @@ func subscribeWatchChannel(conn *Connection, key string) (chan watchState, error
14581530
return st, nil
14591531
}
14601532

1533+
func (conn *Connection) isWatchersRequired() bool {
1534+
for _, feature := range conn.opts.RequiredProtocolInfo.Features {
1535+
if feature == WatchersFeature {
1536+
return true
1537+
}
1538+
}
1539+
return false
1540+
}
1541+
14611542
// NewWatcher creates a new Watcher object for the connection.
14621543
//
14631544
// You need to require WatchersFeature to use watchers, see examples for the
@@ -1496,15 +1577,7 @@ func (conn *Connection) NewWatcher(key string, callback WatchCallback) (Watcher,
14961577
// asynchronous. We do not expect any response from a Tarantool instance
14971578
// That's why we can't just check the Tarantool response for an unsupported
14981579
// request error.
1499-
watchersRequired := false
1500-
for _, feature := range conn.opts.RequiredProtocolInfo.Features {
1501-
if feature == WatchersFeature {
1502-
watchersRequired = true
1503-
break
1504-
}
1505-
}
1506-
1507-
if !watchersRequired {
1580+
if !conn.isWatchersRequired() {
15081581
err := fmt.Errorf("the feature %s must be required by connection "+
15091582
"options to create a watcher", WatchersFeature)
15101583
return nil, err
@@ -1563,7 +1636,11 @@ func (conn *Connection) NewWatcher(key string, callback WatchCallback) (Watcher,
15631636

15641637
if state.cnt == 0 {
15651638
// The last one sends IPROTO_UNWATCH.
1566-
conn.Do(newUnwatchRequest(key)).Get()
1639+
if !conn.ClosedNow() {
1640+
// conn.ClosedNow() check is a workaround for calling
1641+
// Unregister from connectionClose().
1642+
conn.Do(newUnwatchRequest(key)).Get()
1643+
}
15671644
conn.watchMap.Delete(key)
15681645
close(state.unready)
15691646
}
@@ -1666,3 +1743,50 @@ func (conn *Connection) ServerProtocolInfo() ProtocolInfo {
16661743
func (conn *Connection) ClientProtocolInfo() ProtocolInfo {
16671744
return clientProtocolInfo.Clone()
16681745
}
1746+
1747+
func shutdownEventCallback(event WatchEvent) {
1748+
// Receives "true" on server shutdown.
1749+
// See https://www.tarantool.io/en/doc/latest/dev_guide/internals/iproto/graceful_shutdown/
1750+
// step 2.
1751+
val, ok := event.Value.(bool)
1752+
if ok && val {
1753+
go event.Conn.processShutdown()
1754+
}
1755+
}
1756+
1757+
func (conn *Connection) processShutdown() {
1758+
// Forbid state changes.
1759+
conn.mutex.Lock()
1760+
defer conn.mutex.Unlock()
1761+
1762+
atomic.StoreUint32(&(conn.state), connShutdown)
1763+
conn.notify(Shutdown)
1764+
1765+
c := conn.c
1766+
for (atomic.LoadUint32(&(conn.state)) == connShutdown) &&
1767+
(atomic.LoadUint32(&(conn.requestCnt)) != 0) &&
1768+
(c == conn.c) {
1769+
// Use cond var on conn.mutex since request execution may
1770+
// call reconnect(). It is ok if state changes as part of
1771+
// reconnect since Tarantool server won't allow to reconnect
1772+
// in the middle of shutting down.
1773+
conn.cond.Wait()
1774+
}
1775+
// Do not unregister task explicitly here since connection teardown
1776+
// has the same effect. To clean up connection resources,
1777+
// unregister on full close.
1778+
1779+
if (atomic.LoadUint32(&(conn.state)) == connShutdown) &&
1780+
(c == conn.c) {
1781+
// Start to reconnect based on common rules, same as in net.box.
1782+
// Reconnect also closes the connection: server waits until all
1783+
// subscribed connections are terminated.
1784+
// See https://www.tarantool.io/en/doc/latest/dev_guide/internals/iproto/graceful_shutdown/
1785+
// step 3.
1786+
conn.reconnectImpl(
1787+
ClientError{
1788+
ErrConnectionClosed,
1789+
"connection closed after server shutdown",
1790+
}, conn.c)
1791+
}
1792+
}

errors.go

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const (
5555
ErrProtocolError = 0x4000 + iota
5656
ErrTimeouted = 0x4000 + iota
5757
ErrRateLimited = 0x4000 + iota
58+
ErrConnectionShutdown = 0x4000 + iota
5859
)
5960

6061
// Tarantool server error codes.

0 commit comments

Comments
 (0)