subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kot...@apache.org
Subject svn commit: r1743190 - in /subversion/branches/1.9.x-rep-cache-db-fixes: ./ subversion/include/private/ subversion/libsvn_fs_fs/ subversion/libsvn_subr/ subversion/tests/libsvn_fs/ subversion/tests/libsvn_subr/
Date Tue, 10 May 2016 14:09:14 GMT
Author: kotkov
Date: Tue May 10 14:09:13 2016
New Revision: 1743190

URL: http://svn.apache.org/viewvc?rev=1743190&view=rev
Log:
On the 1.9.x-rep-cache-db-fixes branch: Merge r1741096, r1741200 from trunk.

Add private version of new SVN_ERR_SQLITE_ROLLBACK_FAILED error code,
since we cannot backport it as is without breaking compatibility between
patch versions.

  r1741096: Rollback an sqlite transaction in case we fail to COMMIT it.
  r1741200: Following up on r1741096, simplify the error handling code.

Modified:
    subversion/branches/1.9.x-rep-cache-db-fixes/   (props changed)
    subversion/branches/1.9.x-rep-cache-db-fixes/subversion/include/private/svn_sqlite.h
    subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.h
    subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_subr/sqlite.c
    subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_subr/sqlite-test.c

Propchange: subversion/branches/1.9.x-rep-cache-db-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 14:09:13 2016
@@ -98,4 +98,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,1669945,1670139,167
 0149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,
 1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-1706324,1706375,1706428,1706437,1706783,17069
 83,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720643,1721174-1721175,1722860-1722861,1722879,1722887,1725180,1728308,1728387,1729060,1729519,1730856,1734926,1735179,1735826,1736432,1737122,1738259,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741206
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,1669945,1670139,167
 0149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,
 1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-1706324,1706375,1706428,1706437,1706783,17069
 83,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720643,1721174-1721175,1722860-1722861,1722879,1722887,1725180,1728308,1728387,1729060,1729519,1730856,1734926,1735179,1735826,1736432,1737122,1738259,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206

Modified: subversion/branches/1.9.x-rep-cache-db-fixes/subversion/include/private/svn_sqlite.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-rep-cache-db-fixes/subversion/include/private/svn_sqlite.h?rev=1743190&r1=1743189&r2=1743190&view=diff
==============================================================================
--- subversion/branches/1.9.x-rep-cache-db-fixes/subversion/include/private/svn_sqlite.h (original)
+++ subversion/branches/1.9.x-rep-cache-db-fixes/subversion/include/private/svn_sqlite.h Tue
May 10 14:09:13 2016
@@ -555,6 +555,9 @@ svn_sqlite__hotcopy(const char *src_path
                     const char *dst_path,
                     apr_pool_t *scratch_pool);
 
+/* Backported version of SVN_ERR_SQLITE_ROLLBACK_FAILED. */
+#define SVN_SQLITE__ERR_ROLLBACK_FAILED  (SVN_ERR_MISC_CATEGORY_START + 44)
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.c?rev=1743190&r1=1743189&r2=1743190&view=diff
==============================================================================
--- subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.c Tue May
10 14:09:13 2016
@@ -132,6 +132,21 @@ svn_fs_fs__open_rep_cache(svn_fs_t *fs,
 }
 
 svn_error_t *
+svn_fs_fs__close_rep_cache(svn_fs_t *fs)
+{
+  fs_fs_data_t *ffd = fs->fsap_data;
+
+  if (ffd->rep_cache_db)
+    {
+      SVN_ERR(svn_sqlite__close(ffd->rep_cache_db));
+      ffd->rep_cache_db = NULL;
+      ffd->rep_cache_db_opened = 0;
+    }
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
 svn_fs_fs__exists_rep_cache(svn_boolean_t *exists,
                             svn_fs_t *fs, apr_pool_t *pool)
 {

Modified: subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.h?rev=1743190&r1=1743189&r2=1743190&view=diff
==============================================================================
--- subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.h (original)
+++ subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/rep-cache.h Tue May
10 14:09:13 2016
@@ -40,6 +40,10 @@ svn_error_t *
 svn_fs_fs__open_rep_cache(svn_fs_t *fs,
                           apr_pool_t *pool);
 
+/* Close the rep cache database associated with FS. */
+svn_error_t *
+svn_fs_fs__close_rep_cache(svn_fs_t *fs);
+
 /* Set *EXISTS to TRUE iff the rep-cache DB file exists. */
 svn_error_t *
 svn_fs_fs__exists_rep_cache(svn_boolean_t *exists,

Modified: subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/transaction.c?rev=1743190&r1=1743189&r2=1743190&view=diff
==============================================================================
--- subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_fs_fs/transaction.c Tue
May 10 14:09:13 2016
@@ -3623,6 +3623,8 @@ svn_fs_fs__commit(svn_revnum_t *new_rev_
 
   if (ffd->rep_sharing_allowed)
     {
+      svn_error_t *err;
+
       SVN_ERR(svn_fs_fs__open_rep_cache(fs, pool));
 
       /* Write new entries to the rep-sharing database.
@@ -3633,9 +3635,21 @@ svn_fs_fs__commit(svn_revnum_t *new_rev_
       /* ### A commit that touches thousands of files will starve other
              (reader/writer) commits for the duration of the below call.
              Maybe write in batches? */
-      SVN_SQLITE__WITH_TXN(
-        write_reps_to_cache(fs, cb.reps_to_cache, pool),
-        ffd->rep_cache_db);
+      SVN_ERR(svn_sqlite__begin_transaction(ffd->rep_cache_db));
+      err = write_reps_to_cache(fs, cb.reps_to_cache, pool);
+      err = svn_sqlite__finish_transaction(ffd->rep_cache_db, err);
+
+      if (svn_error_find_cause(err, SVN_SQLITE__ERR_ROLLBACK_FAILED))
+        {
+          /* Failed rollback means that our db connection is unusable, and
+             the only thing we can do is close it.  The connection will be
+             reopened during the next operation with rep-cache.db. */
+          return svn_error_trace(
+              svn_error_compose_create(err,
+                                       svn_fs_fs__close_rep_cache(fs)));
+        }
+      else if (err)
+        return svn_error_trace(err);
     }
 
   return SVN_NO_ERROR;

Modified: subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_subr/sqlite.c?rev=1743190&r1=1743189&r2=1743190&view=diff
==============================================================================
--- subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.9.x-rep-cache-db-fixes/subversion/libsvn_subr/sqlite.c Tue May 10
14:09:13 2016
@@ -1300,6 +1300,13 @@ rollback_transaction(svn_sqlite__db_t *d
         }
     }
 
+  if (err)
+    {
+      /* Rollback failed, use a specific error code. */
+      err = svn_error_create(SVN_SQLITE__ERR_ROLLBACK_FAILED, err,
+                             _("SQLite transaction rollback failed"));
+    }
+
   return svn_error_compose_create(error_to_wrap, err);
 }
 
@@ -1347,9 +1354,35 @@ svn_sqlite__finish_transaction(svn_sqlit
     {
       return svn_error_trace(rollback_transaction(db, err));
     }
+  else
+    {
+      err = get_internal_statement(&stmt, db,
+                                   STMT_INTERNAL_COMMIT_TRANSACTION);
+      if (!err)
+        err = svn_error_trace(svn_sqlite__step_done(stmt));
+
+      /* Need to rollback if the commit fails as well, because otherwise the
+         db connection will be left in an unusable state.
+
+         One important case to keep in mind is trying to COMMIT with concurrent
+         readers. In case the commit fails, because someone else is holding a
+         shared lock, sqlite keeps the transaction, and *also* keeps the file
+         locks on the database. While the first part only prevents from using
+         this connection, the second part prevents everyone else from accessing
+         the database while the connection is open.
+
+         See https://www.sqlite.org/lang_transaction.html
+
+         COMMIT might also result in an SQLITE_BUSY return code if an another
+         thread or process has a shared lock on the database that prevented
+         the database from being updated. When COMMIT fails in this way, the
+         transaction remains active and the COMMIT can be retried later after
+         the reader has had a chance to clear. */
+      if (err)
+        return svn_error_trace(rollback_transaction(db, err));
+    }
 
-  SVN_ERR(get_internal_statement(&stmt, db, STMT_INTERNAL_COMMIT_TRANSACTION));
-  return svn_error_trace(svn_sqlite__step_done(stmt));
+  return SVN_NO_ERROR;
 }
 
 svn_error_t *

Modified: subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_fs/fs-test.c?rev=1743190&r1=1743189&r2=1743190&view=diff
==============================================================================
--- subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_fs/fs-test.c Tue
May 10 14:09:13 2016
@@ -7243,8 +7243,8 @@ static struct svn_test_descriptor_t test
                        "test svn_fs_check_related for transactions"),
     SVN_TEST_OPTS_PASS(freeze_and_commit,
                        "freeze and commit"),
-    SVN_TEST_OPTS_XFAIL(commit_with_locked_rep_cache,
-                        "test commit with locked rep-cache"),
+    SVN_TEST_OPTS_PASS(commit_with_locked_rep_cache,
+                       "test commit with locked rep-cache"),
     SVN_TEST_NULL
   };
 

Modified: subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_subr/sqlite-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_subr/sqlite-test.c?rev=1743190&r1=1743189&r2=1743190&view=diff
==============================================================================
--- subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_subr/sqlite-test.c
(original)
+++ subversion/branches/1.9.x-rep-cache-db-fixes/subversion/tests/libsvn_subr/sqlite-test.c
Tue May 10 14:09:13 2016
@@ -178,8 +178,8 @@ static struct svn_test_descriptor_t test
     SVN_TEST_NULL,
     SVN_TEST_PASS2(test_sqlite_reset,
                    "sqlite reset"),
-    SVN_TEST_XFAIL2(test_sqlite_txn_commit_busy,
-                    "sqlite busy on transaction commit"),
+    SVN_TEST_PASS2(test_sqlite_txn_commit_busy,
+                   "sqlite busy on transaction commit"),
     SVN_TEST_NULL
   };
 



Mime
View raw message