Blame suspendlock.diff

Bernhard M. Wiedemann 1250f9
Suspend exclusive database lock when scriptlets get called, allowing
Bernhard M. Wiedemann 1250f9
read access in scriptlets. Only needed for DB_PRIVATE (aka global)
Bernhard M. Wiedemann 1250f9
locking.
Bernhard M. Wiedemann 1250f9
ee825d
--- ./lib/backend/db3.c.orig	2020-09-30 12:25:06.516375109 +0000
ee825d
+++ ./lib/backend/db3.c	2020-09-30 12:25:10.312366497 +0000
ee825d
@@ -549,6 +549,46 @@ static void db3_dbSetFSync(rpmdb rdb, in
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 static int db3_Ctrl(rpmdb rdb, dbCtrlOp ctrl)
Bernhard M. Wiedemann 1250f9
 {
Bernhard M. Wiedemann 1250f9
+    struct flock l;
Bernhard M. Wiedemann 1250f9
+    int tries;
Bernhard M. Wiedemann 1250f9
+    int fdno = -1;
Bernhard M. Wiedemann 1250f9
+    dbiIndex dbi;
Bernhard M. Wiedemann 1250f9
+    DB * db;
Bernhard M. Wiedemann 1250f9
+
Bernhard M. Wiedemann 1250f9
+    switch (ctrl) {
Bernhard M. Wiedemann 1250f9
+    case DB_CTRL_SUSPEND_DBLOCK:
Bernhard M. Wiedemann 1250f9
+    case DB_CTRL_RESUME_DBLOCK:
Bernhard M. Wiedemann 1250f9
+	dbi = rdb->db_pkgs;	/* packages db only */
Bernhard M. Wiedemann 1250f9
+	if (!dbi)
Bernhard M. Wiedemann 1250f9
+	    return 1;
Bernhard M. Wiedemann 1250f9
+	if (!dbi->cfg.dbi_lockdbfd || (dbi->dbi_flags & DBI_VERIFYONLY) != 0)
Bernhard M. Wiedemann 1250f9
+	    return 0;
Bernhard M. Wiedemann 1250f9
+	if (!(dbi->dbi_rpmdb->db_mode & (O_RDWR|O_WRONLY)))
Bernhard M. Wiedemann 1250f9
+	    return 0;
Bernhard M. Wiedemann 1250f9
+	if (_lockdbfd == 0)
Bernhard M. Wiedemann 1250f9
+	    return 0;
Bernhard M. Wiedemann 1250f9
+        db = dbi->dbi_db;
Bernhard M. Wiedemann 1250f9
+	if (!(db->fd(db, &fdno) == 0 && fdno >= 0))
Bernhard M. Wiedemann 1250f9
+	    return 1;
Bernhard M. Wiedemann 1250f9
+	for (tries = 0; tries < 2; tries++) {
Bernhard M. Wiedemann 1250f9
+	    memset(&l, 0, sizeof(l));
Bernhard M. Wiedemann 1250f9
+	    l.l_whence = 0;
Bernhard M. Wiedemann 1250f9
+	    l.l_start = 0;
Bernhard M. Wiedemann 1250f9
+	    l.l_len = 0;
Bernhard M. Wiedemann 1250f9
+	    l.l_type = ctrl == DB_CTRL_SUSPEND_DBLOCK ? F_RDLCK : F_WRLCK;
Bernhard M. Wiedemann 1250f9
+	    if (!fcntl(fdno, tries ? F_SETLKW : F_SETLK, (void *)&l))
Bernhard M. Wiedemann 1250f9
+		return 0;
Bernhard M. Wiedemann 1250f9
+	    if (ctrl == DB_CTRL_SUSPEND_DBLOCK) {
Bernhard M. Wiedemann 1250f9
+		rpmlog(RPMLOG_WARNING, _("could not suspend database lock\n"));
Bernhard M. Wiedemann 1250f9
+		return 1;
Bernhard M. Wiedemann 1250f9
+	    }
Bernhard M. Wiedemann 1250f9
+	    if (tries == 0)
Bernhard M. Wiedemann 1250f9
+		rpmlog(RPMLOG_WARNING, _("waiting to reestablish exclusive database lock\n"));
Bernhard M. Wiedemann 1250f9
+	}
Bernhard M. Wiedemann 1250f9
+	return 1;
Bernhard M. Wiedemann 1250f9
+    default:
Bernhard M. Wiedemann 1250f9
+        break;
Bernhard M. Wiedemann 1250f9
+    }
Bernhard M. Wiedemann 1250f9
     return 0;
Bernhard M. Wiedemann 1250f9
 }
Bernhard M. Wiedemann 1250f9
 
ee825d
--- ./lib/backend/dbi.h.orig	2020-09-30 12:25:06.516375109 +0000
ee825d
+++ ./lib/backend/dbi.h	2020-09-30 12:25:10.312366497 +0000
ee825d
@@ -18,7 +18,9 @@ typedef enum dbCtrlOp_e {
Bernhard M. Wiedemann 1250f9
     DB_CTRL_UNLOCK_RO		= 2,
Bernhard M. Wiedemann 1250f9
     DB_CTRL_LOCK_RW		= 3,
Bernhard M. Wiedemann 1250f9
     DB_CTRL_UNLOCK_RW		= 4,
Bernhard M. Wiedemann 1250f9
-    DB_CTRL_INDEXSYNC		= 5
Bernhard M. Wiedemann 1250f9
+    DB_CTRL_INDEXSYNC		= 5,
Bernhard M. Wiedemann 1250f9
+    DB_CTRL_SUSPEND_DBLOCK      = 100,
Bernhard M. Wiedemann 1250f9
+    DB_CTRL_RESUME_DBLOCK       = 101
Bernhard M. Wiedemann 1250f9
 } dbCtrlOp;
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 typedef struct dbiIndex_s * dbiIndex;
ee825d
--- ./lib/rpmdb.c.orig	2020-09-30 12:25:06.516375109 +0000
ee825d
+++ ./lib/rpmdb.c	2020-09-30 12:25:10.312366497 +0000
ee825d
@@ -2637,6 +2637,12 @@ int rpmdbCtrl(rpmdb db, rpmdbCtrlOp ctrl
Bernhard M. Wiedemann 1250f9
     case RPMDB_CTRL_INDEXSYNC:
Bernhard M. Wiedemann 1250f9
 	dbctrl = DB_CTRL_INDEXSYNC;
Bernhard M. Wiedemann 1250f9
 	break;
Bernhard M. Wiedemann 1250f9
+    case RPMDB_CTRL_SUSPEND_DBLOCK:
Bernhard M. Wiedemann 1250f9
+	dbctrl = DB_CTRL_SUSPEND_DBLOCK;
Bernhard M. Wiedemann 1250f9
+	break;
Bernhard M. Wiedemann 1250f9
+    case RPMDB_CTRL_RESUME_DBLOCK:
Bernhard M. Wiedemann 1250f9
+	dbctrl = DB_CTRL_RESUME_DBLOCK;
Bernhard M. Wiedemann 1250f9
+	break;
Bernhard M. Wiedemann 1250f9
     }
Bernhard M. Wiedemann 1250f9
     return dbctrl ? dbCtrl(db, dbctrl) : 1;
Bernhard M. Wiedemann 1250f9
 }
ee825d
--- ./lib/rpmdb.h.orig	2020-05-28 10:04:25.037136686 +0000
ee825d
+++ ./lib/rpmdb.h	2020-09-30 12:25:10.312366497 +0000
ee825d
@@ -36,7 +36,9 @@ typedef enum rpmdbCtrlOp_e {
Bernhard M. Wiedemann 1250f9
     RPMDB_CTRL_UNLOCK_RO       = 2,
Bernhard M. Wiedemann 1250f9
     RPMDB_CTRL_LOCK_RW         = 3,
Bernhard M. Wiedemann 1250f9
     RPMDB_CTRL_UNLOCK_RW       = 4,
Bernhard M. Wiedemann 1250f9
-    RPMDB_CTRL_INDEXSYNC       = 5
Bernhard M. Wiedemann 1250f9
+    RPMDB_CTRL_INDEXSYNC       = 5,
Bernhard M. Wiedemann 1250f9
+    RPMDB_CTRL_SUSPEND_DBLOCK  = 100,
Bernhard M. Wiedemann 1250f9
+    RPMDB_CTRL_RESUME_DBLOCK   = 101
Bernhard M. Wiedemann 1250f9
 } rpmdbCtrlOp;
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 /** \ingroup rpmdb
ee825d
--- ./lib/transaction.c.orig	2020-09-30 07:48:01.215567727 +0000
ee825d
+++ ./lib/transaction.c	2020-09-30 12:25:10.312366497 +0000
ee825d
@@ -1692,6 +1692,7 @@ rpmRC runScript(rpmts ts, rpmte te, Head
Bernhard M. Wiedemann eb41fd
     rpmTagVal stag = rpmScriptTag(script);
Bernhard M. Wiedemann eb41fd
     FD_t sfd = NULL;
Bernhard M. Wiedemann eb41fd
     int warn_only = !(rpmScriptFlags(script) & RPMSCRIPT_FLAG_CRITICAL);
Bernhard M. Wiedemann 1250f9
+    rpmdb rdb = rpmtsGetRdb(ts);
Bernhard M. Wiedemann 1250f9
 
ee825d
     if (rpmChrootIn())
ee825d
 	return RPMRC_FAIL;
ee825d
@@ -1706,10 +1707,12 @@ rpmRC runScript(rpmts ts, rpmte te, Head
Bernhard M. Wiedemann 1250f9
     if (sfd == NULL)
Bernhard M. Wiedemann 1250f9
 	sfd = rpmtsScriptFd(ts);
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
+    rpmdbCtrl(rdb, RPMDB_CTRL_SUSPEND_DBLOCK);
Bernhard M. Wiedemann 1250f9
     rpmswEnter(rpmtsOp(ts, RPMTS_OP_SCRIPTLETS), 0);
Bernhard M. Wiedemann 1250f9
     rc = rpmScriptRun(script, arg1, arg2, sfd,
Bernhard M. Wiedemann eb41fd
 		      prefixes, rpmtsPlugins(ts));
Bernhard M. Wiedemann 1250f9
     rpmswExit(rpmtsOp(ts, RPMTS_OP_SCRIPTLETS), 0);
Bernhard M. Wiedemann 1250f9
+    rpmdbCtrl(rdb, RPMDB_CTRL_RESUME_DBLOCK);
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
     /* Map warn-only errors to "notfound" for script stop callback */
Bernhard M. Wiedemann 1250f9
     stoprc = (rc != RPMRC_OK && warn_only) ? RPMRC_NOTFOUND : rc;