diff --git a/ovsdb/execution.c b/ovsdb/execution.c index bb3befe43..6a62ba2ef 100644 --- a/ovsdb/execution.c +++ b/ovsdb/execution.c @@ -173,11 +173,18 @@ ovsdb_execute(struct ovsdb *db, const struct ovsdb_session *session, error = parse_error; } /* Create read-only violation error if there is one. */ - if (!error && read_only && !ro) { - error = ovsdb_error("not allowed", - "%s operation not allowed when " - "database server is in read only mode", - op_name); + if (!ro && !error) { + if (read_only) { + error = ovsdb_error("not allowed", + "%s operation not allowed when " + "database server is in read only mode", + op_name); + } else if (db->schema->name[0] == '_') { + error = ovsdb_error("not allowed", + "%s operation not allowed on " + "table in reserved database %s", + op_name, db->schema->name); + } } if (error) { json_destroy(result); diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 974cc0cbc..947cad0c7 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -137,14 +137,23 @@ main(int argc, char *argv[]) if (argc - optind > command->min_args && svec_contains(&dbs, argv[optind])) { database = xstrdup(argv[optind++]); - } else if (dbs.n == 1) { - database = xstrdup(dbs.names[0]); } else if (svec_contains(&dbs, "Open_vSwitch")) { database = xstrdup("Open_vSwitch"); } else { - jsonrpc_close(rpc); - ovs_fatal(0, "no default database for `%s' command, please " - "specify a database name", command->name); + size_t n = 0; + const char *best = NULL; + for (size_t i = 0; i < dbs.n; i++) { + if (dbs.names[i][0] != '_') { + best = dbs.names[i]; + n++; + } + } + if (n != 1) { + jsonrpc_close(rpc); + ovs_fatal(0, "no default database for `%s' command, please " + "specify a database name", command->name); + } + database = xstrdup(best); } svec_destroy(&dbs); } else { diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index ffdcf6810..7f2d19ef5 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -142,7 +142,9 @@ ovsdb_replication_init(const char *sync_from, const char *exclude, struct shash_node *node; SHASH_FOR_EACH (node, all_dbs) { struct db *db = node->data; - replication_add_local_db(node->name, db->db); + if (node->name[0] != '_' && db->db) { + replication_add_local_db(node->name, db->db); + } } } @@ -514,6 +516,9 @@ open_db(struct server_config *config, const char *filename) db_error = ovsdb_file_open(db->filename, false, &db->db, &db->file); if (db_error) { error = ovsdb_error_to_string_free(db_error); + } else if (db->db->schema->name[0] == '_') { + error = xasprintf("%s: names beginning with \"_\" are reserved", + db->db->schema->name); } else if (!ovsdb_jsonrpc_server_add_db(config->jsonrpc, db->db)) { error = xasprintf("%s: duplicate database name", db->db->schema->name); } else { @@ -1131,16 +1136,24 @@ static void ovsdb_server_compact(struct unixctl_conn *conn, int argc, const char *argv[], void *dbs_) { + const char *db_name = argc < 2 ? NULL : argv[1]; struct shash *all_dbs = dbs_; struct ds reply; struct db *db; struct shash_node *node; int n = 0; + if (db_name && db_name[0] == '_') { + unixctl_command_reply_error(conn, "cannot compact built-in databases"); + return; + } + ds_init(&reply); SHASH_FOR_EACH(node, all_dbs) { db = node->data; - if (argc < 2 || !strcmp(argv[1], node->name)) { + if (db_name + ? !strcmp(node->name, db_name) + : node->name[0] != '_') { struct ovsdb_error *error; VLOG_INFO("compacting %s database by user request", node->name); @@ -1275,21 +1288,12 @@ ovsdb_server_add_database(struct unixctl_conn *conn, int argc OVS_UNUSED, } static void -ovsdb_server_remove_database(struct unixctl_conn *conn, int argc OVS_UNUSED, - const char *argv[], void *config_) +remove_db(struct server_config *config, struct shash_node *node) { - struct server_config *config = config_; - struct shash_node *node; struct db *db; bool ok; - node = shash_find(config->all_dbs, argv[1]); - if (!node) { - unixctl_command_reply_error(conn, "Failed to find the database."); - return; - } db = node->data; - ok = ovsdb_jsonrpc_server_remove_db(config->jsonrpc, db->db); ovs_assert(ok); @@ -1303,6 +1307,26 @@ ovsdb_server_remove_database(struct unixctl_conn *conn, int argc OVS_UNUSED, ovsdb_replication_init(*config->sync_from, *config->sync_exclude, config->all_dbs, server_uuid); } +} + +static void +ovsdb_server_remove_database(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[], void *config_) +{ + struct server_config *config = config_; + struct shash_node *node; + + node = shash_find(config->all_dbs, argv[1]); + if (!node) { + unixctl_command_reply_error(conn, "Failed to find the database."); + return; + } + if (node->name[0] == '_') { + unixctl_command_reply_error(conn, "Cannot remove reserved database."); + return; + } + + remove_db(config, node); unixctl_command_reply(conn, NULL); } @@ -1562,7 +1586,9 @@ save_config(struct server_config *config) sset_init(&db_filenames); SHASH_FOR_EACH (node, config->all_dbs) { struct db *db = node->data; - sset_add(&db_filenames, db->filename); + if (node->name[0] != '_') { + sset_add(&db_filenames, db->filename); + } } save_config__(config->config_tmpfile, config->remotes, &db_filenames, diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index b830be0c1..968356781 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -689,6 +689,11 @@ _uuid name number dnl Now compact the database in-place. AT_CHECK([[ovs-appctl -t ovsdb-server ovsdb-server/compact]], [0], [], [ignore], [test ! -e pid || kill `cat pid`]) +dnl Negative test. +AT_CHECK([[ovs-appctl -t ovsdb-server ovsdb-server/compact _Server]], + [2], [], [cannot compact built-in databases +ovs-appctl: ovsdb-server: server returned an error +]) dnl Make sure that "db" is still a symlink to dir/db instead of getting dnl replaced by a regular file, ditto for .db.~lock~. if test "$IS_WIN32" = "no"; then