hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-922: Serialize created servers

Browse Source 
When a server is created via MaxAdmin, it will be serialized to disk. This
allows created servers to be retained through a restart of MaxScale.

Currently, all serialized objects are stored in one folder and there is no
structure in the created files. In the future, servers could be created
under a `servers` subdirectory so that it is easier to see what was
added. Whether there is a need for this will be seen.
This commit is contained in:
Markus Makela
2016-11-10 13:09:27 +02:00
parent bbd3e13a54
commit c9218351b8
4 changed files with 86 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/core/test/testserver.c
View File

@ -140,31 +140,37 @@ bool test_load_config(const char *input, SERVER *server)
bool test_serialize()
{
char name[] = "serialized-server";
char config_name[] = "serialized-server.cnf";
char old_config_name[] = "serialized-server.cnf.old";
char *persist_dir = MXS_STRDUP_A("./");
set_config_persistdir(persist_dir);
SERVER *server = server_alloc("127.0.0.1", "HTTPD", 9876, "NullAuthAllow", "fake=option");
TEST(server, "Server allocation failed");
server_set_unique_name(server, name);
/** Make sure the file doesn't exist */
unlink("./server.cnf");
/** Make sure the files don't exist */
unlink(config_name);
unlink(old_config_name);
/** Serialize server to disk */
TEST(server_serialize(server, "./server.cnf"), "Failed to synchronize original server");
TEST(server_serialize(server), "Failed to synchronize original server");
/** Load it again */
TEST(test_load_config("./server.cnf", server), "Failed to load the serialized server");
TEST(test_load_config(config_name, server), "Failed to load the serialized server");
/** We should have two identical servers */
SERVER *created = server_find_by_unique_name(name);
TEST(created->next == server, "We should end up with two servers");
/** Make sure the file doesn't exist */
unlink("./server-created.cnf");
rename(config_name, old_config_name);
/** Serialize the loaded server to disk */
TEST(server_serialize(created, "./server-created.cnf"), "Failed to synchronize the copied server");
TEST(server_serialize(created), "Failed to synchronize the copied server");
/** Check that they serialize to identical files */
TEST(system("diff ./server.cnf ./server-created.cnf") == 0, "The files are not identical");
char cmd[1024];
sprintf(cmd, "diff ./%s ./%s", config_name, old_config_name);
TEST(system(cmd) == 0, "The files are not identical");
return true;
}