From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 23 Oct 2018 04:08:44 +0000 (-0700)
Subject: rdbms: add transaction comment to IDatabase::masterPosWait()
X-Git-Tag: 1.34.0-rc.0~3640^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=a58a9d5fce7caab2224676d5e4ef34ee1f72363f;p=lhc%2Fweb%2Fwiklou.git

rdbms: add transaction comment to IDatabase::masterPosWait()

Change-Id: I95aa3b678b76cd06439d1feaba7f09a9c13f8931
---

diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index 197332208b..6d78dfcf98 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -1478,6 +1478,10 @@ interface IDatabase {
 	/**
 	 * Wait for the replica DB to catch up to a given master position
 	 *
+	 * Note that this does not start any new transactions. If any existing transaction
+	 * is flushed, and this is called, then queries will reflect the point the DB was synced
+	 * up to (on success) without interference from REPEATABLE-READ snapshots.
+	 *
 	 * @param DBMasterPos $pos
 	 * @param int $timeout The maximum number of seconds to wait for synchronisation
 	 * @return int|null Zero if the replica DB was past that position already,