On Thu, Feb 17, 2022 at 02:15:26PM +0100, Richard Weinberger wrote: > +#define REEXPDB_SHM_NAME "/nfs_reexport_db_lock" > +#define REEXPDB_SHM_SZ 4096 > +#define REEXPDB_INIT_LOCK NFS_STATEDIR "/reexpdb_init.lock" > +#define REEXPDB_DBFILE NFS_STATEDIR "/reexpdb.sqlite3" I don't know much about sqlite--why do we need to do our own file locking? If we do need to do it ourself, could we lock the database file instead instead of using a separate lock file? > +static const char initdb_sql[] = "CREATE TABLE IF NOT EXISTS fsidnums (num INTEGER PRIMARY KEY CHECK (num > 0 AND num < 4294967296), path TEXT UNIQUE); CREATE TABLE IF NOT EXISTS subvolumes (path TEXT PRIMARY KEY); CREATE INDEX IF NOT EXISTS idx_ids_path ON fsidnums (path);"; I'd personally find it easier to read if these were defined in the place where they're used. (And, honestly, if this is just used once, maybe the definition is unnecessary.) What are the two tables used for? Naively I'd've thought the "subvolumes" table was redundant. > +/* > + * This query is a little tricky. We use SQL to find and claim the smallest free fsid number. Yes, that is a little tricky. Is it necessary? My SQL Is rusty, but the database should be able to pick a unique value for us, shouldn't it? > + * To find a free fsid the fsidnums is left joined to itself but with an offset of 1. > + * Everything after the UNION statement is to handle the corner case where fsidnums > + * is empty. In this case we want 1 as first fsid number. > + */ > +static const char new_fsidnum_by_path_sql[] = "INSERT INTO fsidnums VALUES ((SELECT ids1.num + 1 FROM fsidnums AS ids1 LEFT JOIN fsidnums AS ids2 ON ids2.num = ids1.num + 1 WHERE ids2.num IS NULL UNION SELECT 1 WHERE NOT EXISTS (SELECT NULL FROM fsidnums WHERE num = 1) LIMIT 1), ?1) RETURNING num;"; > +static const char fsidnum_by_path_sql[] = "SELECT num FROM fsidnums WHERE path = ?1;"; > +static const char add_crossed_volume_sql[] = "REPLACE INTO subvolumes VALUES(?1);"; > +static const char drop_crossed_volume_sql[] = "DELETE FROM subvolumes WHERE path = ?1;"; > +static const char get_crossed_volumes_sql[] = "SELECT path from subvolumes;"; ... > +/* > + * reexpdb_init - Initialize reexport database > + * > + * Setup shared lock (database is concurrently used by multiple processes), So, this should all work when rpc.mountd is run with --num_threads > 1? --b.
