2de544cfcc
The implementation of the diskless replication was currently diskless only on the master side. The slave side was still storing the received rdb file to the disk before loading it back in and parsing it. This commit adds two modes to load rdb directly from socket: 1) when-empty 2) using "swapdb" the third mode of using diskless slave by flushdb is risky and currently not included. other changes: -------------- distinguish between aof configuration and state so that we can re-enable aof only when sync eventually succeeds (and not when exiting from readSyncBulkPayload after a failed attempt) also a CONFIG GET and INFO during rdb loading would have lied When loading rdb from the network, don't kill the server on short read (that can be a network error) Fix rdb check when performed on preamble AOF tests: run replication tests for diskless slave too make replication test a bit more aggressive Add test for diskless load swapdb
82 lines
3.5 KiB
C
82 lines
3.5 KiB
C
/* anet.c -- Basic TCP socket stuff made a bit less boring
|
|
*
|
|
* Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
* to endorse or promote products derived from this software without
|
|
* specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef ANET_H
|
|
#define ANET_H
|
|
|
|
#include <sys/types.h>
|
|
|
|
#define ANET_OK 0
|
|
#define ANET_ERR -1
|
|
#define ANET_ERR_LEN 256
|
|
|
|
/* Flags used with certain functions. */
|
|
#define ANET_NONE 0
|
|
#define ANET_IP_ONLY (1<<0)
|
|
|
|
#if defined(__sun) || defined(_AIX)
|
|
#define AF_LOCAL AF_UNIX
|
|
#endif
|
|
|
|
#ifdef _AIX
|
|
#undef ip_len
|
|
#endif
|
|
|
|
int anetTcpConnect(char *err, char *addr, int port);
|
|
int anetTcpNonBlockConnect(char *err, char *addr, int port);
|
|
int anetTcpNonBlockBindConnect(char *err, char *addr, int port, char *source_addr);
|
|
int anetTcpNonBlockBestEffortBindConnect(char *err, char *addr, int port, char *source_addr);
|
|
int anetUnixConnect(char *err, char *path);
|
|
int anetUnixNonBlockConnect(char *err, char *path);
|
|
int anetRead(int fd, char *buf, int count);
|
|
int anetResolve(char *err, char *host, char *ipbuf, size_t ipbuf_len);
|
|
int anetResolveIP(char *err, char *host, char *ipbuf, size_t ipbuf_len);
|
|
int anetTcpServer(char *err, int port, char *bindaddr, int backlog);
|
|
int anetTcp6Server(char *err, int port, char *bindaddr, int backlog);
|
|
int anetUnixServer(char *err, char *path, mode_t perm, int backlog);
|
|
int anetTcpAccept(char *err, int serversock, char *ip, size_t ip_len, int *port);
|
|
int anetUnixAccept(char *err, int serversock);
|
|
int anetWrite(int fd, char *buf, int count);
|
|
int anetNonBlock(char *err, int fd);
|
|
int anetBlock(char *err, int fd);
|
|
int anetEnableTcpNoDelay(char *err, int fd);
|
|
int anetDisableTcpNoDelay(char *err, int fd);
|
|
int anetTcpKeepAlive(char *err, int fd);
|
|
int anetSendTimeout(char *err, int fd, long long ms);
|
|
int anetRecvTimeout(char *err, int fd, long long ms);
|
|
int anetPeerToString(int fd, char *ip, size_t ip_len, int *port);
|
|
int anetKeepAlive(char *err, int fd, int interval);
|
|
int anetSockName(int fd, char *ip, size_t ip_len, int *port);
|
|
int anetFormatAddr(char *fmt, size_t fmt_len, char *ip, int port);
|
|
int anetFormatPeer(int fd, char *fmt, size_t fmt_len);
|
|
int anetFormatSock(int fd, char *fmt, size_t fmt_len);
|
|
|
|
#endif
|