commit 407feb7f61507dace3b385c4f01d07d0ff19c26c
author Seth Moore <sethmo@google.com> Wed May 12 05:10:44 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 12 05:10:44 2021 +0000
tree c7696554b3d84b9181ff1a41619ba0b9309afe47
parent 8a9352625f65fdbbec377a0e29134429fd037431
parent 9c70b6b54aa043d5e31048c7d1adbcef7cb54b1d

Merge "Revert "Enable write-ahead logging for keystore db.""

keystore2/src/database.rs

diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index 0cc3aa9..ce0cb1d 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -984,12 +984,6 @@
                     return Err(e);
                 }
             }
-            let result: String = conn
-                .pragma_update_and_check(None, "journal_mode", &"WAL", |row| row.get(0))
-                .expect("Attempting to set journal mode failed.");
-            if result != "wal" {
-                error!("Failed to put DB in WAL mode.  This will make keystore slow.");
-            }
             break;
         }
 

keystore2/vpnprofilestore/lib.rs

diff --git a/keystore2/vpnprofilestore/lib.rs b/keystore2/vpnprofilestore/lib.rs
index 3d986a2..548bec5 100644
--- a/keystore2/vpnprofilestore/lib.rs
+++ b/keystore2/vpnprofilestore/lib.rs
@@ -24,7 +24,6 @@
 };
 use anyhow::{Context, Result};
 use keystore2::{async_task::AsyncTask, legacy_blob::LegacyBlobLoader, utils::watchdog as wd};
-use log::error;
 use rusqlite::{
     params, Connection, OptionalExtension, Transaction, TransactionBehavior, NO_PARAMS,
 };
@@ -44,15 +43,6 @@
         };
 
         db.init_tables().context("Trying to initialize vpnstore db.")?;
-
-        let result: String = db
-            .conn
-            .pragma_update_and_check(None, "journal_mode", &"WAL", |row| row.get(0))
-            .expect("Attempting to set journal mode failed.");
-        if result != "wal" {
-            error!("Failed to put DB in WAL mode.  This will make keystore slow.");
-        }
-
         Ok(db)
     }