7d1c15b07a
First, Leaving off the source address caused a segfault in the command-sending process because there was no NULL check on the ARGV entry. Second, while the migration thread sent a signal to the server to close on successful completion, it didn't wait until the close actually happened before releasing the IO lock. This meant that any client thread waiting on that IO lock could have a read or a write queued up which could succeed despite the server shutdown. This would have meant dataloss as the guest would see a successful write to the wrong instance of the file. This patch adds a noddy serve_wait_for_close() function which the mirror_runner calls to ensure that any clients will reject operations they're waiting to complete. This patch also adds a simple scenario test for migration, and fixes TempFileWriter#read_original.
105 lines
2.6 KiB
C
105 lines
2.6 KiB
C
#ifndef SERVE_H
|
|
#define SERVE_H
|
|
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
|
|
#include "parse.h"
|
|
#include "acl.h"
|
|
|
|
|
|
static const int block_allocation_resolution = 4096;//128<<10;
|
|
|
|
enum mirror_finish_action {
|
|
ACTION_EXIT,
|
|
ACTION_NOTHING
|
|
};
|
|
|
|
struct mirror_status {
|
|
pthread_t thread;
|
|
/* set to 1, then join thread to make mirror terminate early */
|
|
int signal_abandon;
|
|
int client;
|
|
char *filename;
|
|
off64_t max_bytes_per_second;
|
|
enum mirror_finish_action action_at_finish;
|
|
|
|
char *mapped;
|
|
struct bitset_mapping *dirty_map;
|
|
};
|
|
|
|
struct control_params {
|
|
int socket;
|
|
struct server* serve;
|
|
};
|
|
|
|
struct client_tbl_entry {
|
|
pthread_t thread;
|
|
union mysockaddr address;
|
|
struct client * client;
|
|
};
|
|
|
|
|
|
#define MAX_NBD_CLIENTS 16
|
|
struct server {
|
|
/** address/port to bind to */
|
|
union mysockaddr bind_to;
|
|
/** (static) file name to serve */
|
|
char* filename;
|
|
/** file name of INCOMPLETE flag */
|
|
char* filename_incomplete;
|
|
/** TCP backlog for listen() */
|
|
int tcp_backlog;
|
|
/** (static) file name of UNIX control socket (or NULL if none) */
|
|
char* control_socket_name;
|
|
/** size of file */
|
|
uint64_t size;
|
|
|
|
/** Claims around any I/O to this file */
|
|
pthread_mutex_t l_io;
|
|
|
|
/** to interrupt accept loop and clients, write() to close_signal[1] */
|
|
struct self_pipe * close_signal;
|
|
|
|
/** access control list */
|
|
struct acl * acl;
|
|
/** acl_updated_signal will be signalled after the acl struct
|
|
* has been replaced
|
|
*/
|
|
struct self_pipe * acl_updated_signal;
|
|
pthread_mutex_t l_acl;
|
|
|
|
struct mirror_status* mirror;
|
|
int server_fd;
|
|
int control_fd;
|
|
|
|
struct bitset_mapping* allocation_map;
|
|
|
|
struct client_tbl_entry nbd_client[MAX_NBD_CLIENTS];
|
|
};
|
|
|
|
struct server * server_create( char* s_ip_address, char* s_port, char* s_file,
|
|
char *s_ctrl_sock, int default_deny, int acl_entries, char** s_acl_entries );
|
|
void server_destroy( struct server * );
|
|
int server_is_closed(struct server* serve);
|
|
void server_dirty(struct server *serve, off64_t from, int len);
|
|
void server_lock_io( struct server * serve);
|
|
void server_unlock_io( struct server* serve );
|
|
void serve_signal_close( struct server *serve );
|
|
void serve_wait_for_close( struct server * serve );
|
|
void server_replace_acl( struct server *serve, struct acl * acl);
|
|
|
|
|
|
struct mode_readwrite_params {
|
|
union mysockaddr connect_to;
|
|
union mysockaddr connect_from;
|
|
off64_t from;
|
|
off64_t len;
|
|
int data_fd;
|
|
int client;
|
|
};
|
|
|
|
|
|
#endif
|
|
|