+#include <assert.h>
+#include <errno.h>
+#include <getopt.h>
+#include <signal.h>
+#include <stddef.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <stdint.h>
-#include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <sys/time.h>
-#include <signal.h>
-#include <errno.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <vector>
-#include <string>
+#include <sys/wait.h>
+#include <unistd.h>
#include <map>
#include <set>
+#include <string>
+#include <utility>
+#include <vector>
#include "acceptor.h"
#include "config.h"
+#include "input.h"
+#include "log.h"
#include "markpool.h"
-#include "metacube.h"
-#include "parse.h"
-#include "server.h"
#include "serverpool.h"
-#include "input.h"
+#include "state.pb.h"
#include "stats.h"
+#include "util.h"
#include "version.h"
-#include "state.pb.h"
using namespace std;
hupped = true;
}
-// Serialize the given state to a file descriptor, and return the (still open)
-// descriptor.
-int make_tempfile(const CubemapStateProto &state)
-{
- char tmpl[] = "/tmp/cubemapstate.XXXXXX";
- int state_fd = mkstemp(tmpl);
- if (state_fd == -1) {
- perror("mkstemp");
- exit(1);
- }
-
- string serialized;
- state.SerializeToString(&serialized);
-
- const char *ptr = serialized.data();
- size_t to_write = serialized.size();
- while (to_write > 0) {
- ssize_t ret = write(state_fd, ptr, to_write);
- if (ret == -1) {
- perror("write");
- exit(1);
- }
-
- ptr += ret;
- to_write -= ret;
- }
-
- return state_fd;
-}
-
CubemapStateProto collect_state(const timeval &serialize_start,
const vector<Acceptor *> acceptors,
const vector<Input *> inputs,
- ServerPool *servers,
- int num_servers)
+ ServerPool *servers)
{
- CubemapStateProto state;
+ CubemapStateProto state = servers->serialize(); // Fills streams() and clients().
state.set_serialize_start_sec(serialize_start.tv_sec);
state.set_serialize_start_usec(serialize_start.tv_usec);
state.add_inputs()->MergeFrom(inputs[i]->serialize());
}
- for (int i = 0; i < num_servers; ++i) {
- CubemapStateProto local_state = servers->get_server(i)->serialize();
-
- // The stream state should be identical between the servers, so we only store it once.
- if (i == 0) {
- state.mutable_streams()->MergeFrom(local_state.streams());
- }
- for (int j = 0; j < local_state.clients_size(); ++j) {
- state.add_clients()->MergeFrom(local_state.clients(j));
- }
- }
-
return state;
}
-// Read the state back from the file descriptor made by make_tempfile,
-// and close it.
-CubemapStateProto read_tempfile(int state_fd)
-{
- if (lseek(state_fd, 0, SEEK_SET) == -1) {
- perror("lseek");
- exit(1);
- }
-
- string serialized;
- char buf[4096];
- for ( ;; ) {
- ssize_t ret = read(state_fd, buf, sizeof(buf));
- if (ret == -1) {
- perror("read");
- exit(1);
- }
- if (ret == 0) {
- // EOF.
- break;
- }
-
- serialized.append(string(buf, buf + ret));
- }
-
- close(state_fd); // Implicitly deletes the file.
-
- CubemapStateProto state;
- if (!state.ParseFromString(serialized)) {
- fprintf(stderr, "PANIC: Failed deserialization of state.\n");
- exit(1);
- }
-
- return state;
-}
-
// Find all port statements in the configuration file, and create acceptors for htem.
vector<Acceptor *> create_acceptors(
const Config &config,
if (deserialized_input_it != deserialized_inputs->end()) {
input = deserialized_input_it->second;
if (input->get_url() != src) {
- fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n",
+ log(INFO, "Stream '%s' has changed URL from '%s' to '%s', restarting input.",
stream_id.c_str(), input->get_url().c_str(), src.c_str());
input->close_socket();
delete input;
if (input == NULL) {
input = create_input(stream_id, src);
if (input == NULL) {
- fprintf(stderr, "ERROR: did not understand URL '%s', clients will not get any data.\n",
+ log(ERROR, "did not understand URL '%s', clients will not get any data.",
src.c_str());
continue;
}
for (unsigned i = 0; i < config.streams.size(); ++i) {
const StreamConfig &stream_config = config.streams[i];
if (deserialized_stream_ids.count(stream_config.stream_id) == 0) {
- servers->add_stream(stream_config.stream_id);
+ servers->add_stream(stream_config.stream_id, stream_config.backlog_size);
+ } else {
+ servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
}
expecting_stream_ids.erase(stream_config.stream_id);
stream_it != expecting_stream_ids.end();
++stream_it) {
string stream_id = *stream_it;
- fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n",
- stream_id.c_str());
- fprintf(stderr, " It will not be deleted, but clients will not get any new inputs.\n");
+ log(WARNING, "stream '%s' disappeared from the configuration file. "
+ "It will not be deleted, but clients will not get any new inputs.",
+ stream_id.c_str());
if (deserialized_inputs->count(stream_id) != 0) {
delete (*deserialized_inputs)[stream_id];
deserialized_inputs->erase(stream_id);
}
}
}
+
+void open_logs(const vector<LogConfig> &log_destinations)
+{
+ for (size_t i = 0; i < log_destinations.size(); ++i) {
+ if (log_destinations[i].type == LogConfig::LOG_TYPE_FILE) {
+ add_log_destination_file(log_destinations[i].filename);
+ } else if (log_destinations[i].type == LogConfig::LOG_TYPE_CONSOLE) {
+ add_log_destination_console();
+ } else if (log_destinations[i].type == LogConfig::LOG_TYPE_SYSLOG) {
+ add_log_destination_syslog();
+ } else {
+ assert(false);
+ }
+ }
+ start_logging();
+}
+
+bool dry_run_config(const std::string &argv0, const std::string &config_filename)
+{
+ char *argv0_copy = strdup(argv0.c_str());
+ char *config_filename_copy = strdup(config_filename.c_str());
+
+ pid_t pid = fork();
+ switch (pid) {
+ case -1:
+ log_perror("fork()");
+ free(argv0_copy);
+ free(config_filename_copy);
+ return false;
+ case 0:
+ // Child.
+ execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, NULL);
+ log_perror(argv0_copy);
+ _exit(1);
+ default:
+ // Parent.
+ break;
+ }
+
+ free(argv0_copy);
+ free(config_filename_copy);
+
+ int status;
+ pid_t err;
+ do {
+ err = waitpid(pid, &status, 0);
+ } while (err == -1 && errno == EINTR);
+
+ if (err == -1) {
+ log_perror("waitpid()");
+ return false;
+ }
+
+ return (WIFEXITED(status) && WEXITSTATUS(status) == 0);
+}
int main(int argc, char **argv)
{
- fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
+ signal(SIGHUP, hup);
+ signal(SIGPIPE, SIG_IGN);
+
+ // Parse options.
+ int state_fd = -1;
+ bool test_config = false;
+ for ( ;; ) {
+ static const option long_options[] = {
+ { "state", required_argument, 0, 's' },
+ { "test-config", no_argument, 0, 't' },
+ };
+ int option_index = 0;
+ int c = getopt_long (argc, argv, "s:t", long_options, &option_index);
+
+ if (c == -1) {
+ break;
+ }
+ switch (c) {
+ case 's':
+ state_fd = atoi(optarg);
+ break;
+ case 't':
+ test_config = true;
+ break;
+ default:
+ assert(false);
+ }
+ }
- struct timeval serialize_start;
- bool is_reexec = false;
+ string config_filename = "cubemap.config";
+ if (optind < argc) {
+ config_filename = argv[optind++];
+ }
- string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
Config config;
if (!parse_config(config_filename, &config)) {
exit(1);
- }
+ }
+ if (test_config) {
+ exit(0);
+ }
+
+start:
+ // Open logs as soon as possible.
+ open_logs(config.log_destinations);
+ log(NO_LEVEL, "Cubemap " SERVER_VERSION " starting.");
servers = new ServerPool(config.num_servers);
CubemapStateProto loaded_state;
+ struct timeval serialize_start;
set<string> deserialized_stream_ids;
map<string, Input *> deserialized_inputs;
map<int, Acceptor *> deserialized_acceptors;
- if (argc == 4 && strcmp(argv[2], "-state") == 0) {
- is_reexec = true;
-
- fprintf(stderr, "Deserializing state from previous process... ");
- int state_fd = atoi(argv[3]);
- loaded_state = read_tempfile(state_fd);
+ if (state_fd != -1) {
+ log(INFO, "Deserializing state from previous process...");
+ string serialized;
+ if (!read_tempfile(state_fd, &serialized)) {
+ exit(1);
+ }
+ if (!loaded_state.ParseFromString(serialized)) {
+ log(ERROR, "Failed deserialization of state.");
+ exit(1);
+ }
serialize_start.tv_sec = loaded_state.serialize_start_sec();
serialize_start.tv_usec = loaded_state.serialize_start_usec();
create_input(loaded_state.inputs(i))));
}
- // Convert the acceptor from older serialized formats.
- if (loaded_state.has_server_sock() && loaded_state.has_port()) {
- AcceptorProto *acceptor = loaded_state.add_acceptors();
- acceptor->set_server_sock(loaded_state.server_sock());
- acceptor->set_port(loaded_state.port());
- }
-
// Deserialize the acceptors.
for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
deserialized_acceptors.insert(make_pair(
new Acceptor(loaded_state.acceptors(i))));
}
- fprintf(stderr, "done.\n");
+ log(INFO, "Deserialization done.");
}
// Find all streams in the configuration file, and create them.
create_streams(config, deserialized_stream_ids, &deserialized_inputs);
- servers->run();
-
vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
vector<Input *> inputs = create_inputs(config, &deserialized_inputs);
// All deserialized inputs should now have been taken care of, one way or the other.
assert(deserialized_inputs.empty());
- if (is_reexec) {
- // Put back the existing clients. It doesn't matter which server we
- // allocate them to, so just do round-robin. However, we need to add
- // them after the mark pools have been set up.
- for (int i = 0; i < loaded_state.clients_size(); ++i) {
- servers->add_client_from_serialized(loaded_state.clients(i));
- }
+ // Put back the existing clients. It doesn't matter which server we
+ // allocate them to, so just do round-robin. However, we need to add
+ // them after the mark pools have been set up.
+ for (int i = 0; i < loaded_state.clients_size(); ++i) {
+ servers->add_client_from_serialized(loaded_state.clients(i));
}
+
+ servers->run();
// Start writing statistics.
StatsThread *stats_thread = NULL;
if (!config.stats_file.empty()) {
stats_thread = new StatsThread(config.stats_file, config.stats_interval);
stats_thread->run();
- } else if (config.stats_interval != -1) {
- fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n");
}
- signal(SIGHUP, hup);
-
struct timeval server_start;
gettimeofday(&server_start, NULL);
- if (is_reexec) {
+ if (state_fd != -1) {
// Measure time from we started deserializing (below) to now, when basically everything
// is up and running. This is, in other words, a conservative estimate of how long our
// “glitch” period was, not counting of course reconnects if the configuration changed.
double glitch_time = server_start.tv_sec - serialize_start.tv_sec +
1e-6 * (server_start.tv_usec - serialize_start.tv_usec);
- fprintf(stderr, "Re-exec happened in approx. %.0f ms.\n", glitch_time * 1000.0);
+ log(INFO, "Re-exec happened in approx. %.0f ms.", glitch_time * 1000.0);
}
while (!hupped) {
}
servers->stop();
- fprintf(stderr, "Serializing state and re-execing...\n");
- int state_fd = make_tempfile(collect_state(
- serialize_start, acceptors, inputs, servers, config.num_servers));
+ log(INFO, "Serializing state and re-execing...");
+ CubemapStateProto state = collect_state(
+ serialize_start, acceptors, inputs, servers);
+ string serialized;
+ state.SerializeToString(&serialized);
+ state_fd = make_tempfile(serialized);
+ if (state_fd == -1) {
+ exit(1);
+ }
delete servers;
+ shut_down_logging();
+
+ if (!dry_run_config(argv[0], config_filename)) {
+ open_logs(config.log_destinations);
+ log(ERROR, "%s --test-config failed. Restarting old version instead of new.", argv[0]);
+ hupped = false;
+ shut_down_logging();
+ goto start;
+ }
+
char buf[16];
sprintf(buf, "%d", state_fd);
for ( ;; ) {
- execlp(argv[0], argv[0], config_filename.c_str(), "-state", buf, NULL);
- perror("execlp");
- fprintf(stderr, "PANIC: re-exec of %s failed. Waiting 0.2 seconds and trying again...\n", argv[0]);
+ execlp(argv[0], argv[0], config_filename.c_str(), "--state", buf, NULL);
+ open_logs(config.log_destinations);
+ log_perror("execlp");
+ log(ERROR, "re-exec of %s failed. Waiting 0.2 seconds and trying again...", argv[0]);
+ shut_down_logging();
usleep(200000);
}
}
projects / cubemap / blobdiff