Hide multi-master cache coherency issues on preferences
User preferences are held in memory in the accounts cache, but can be
stale in a multi-master configuration due to writes being handled on a
different server process. Paper over the lack of cache coherency by
reading the preferences from the database anytime they are requested
through the RPC or REST APIs.
Change-Id: I2a14e1f50e908a1d5ea5628e5a05e392be2e0d42
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java
index ebeef67..7b02630 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java
@@ -69,7 +69,12 @@
}
public void myAccount(final AsyncCallback<Account> callback) {
- callback.onSuccess(currentUser.get().getAccount());
+ run(callback, new Action<Account>() {
+ @Override
+ public Account run(ReviewDb db) throws OrmException {
+ return db.accounts().get(currentUser.get().getAccountId());
+ }
+ });
}
public void changePreferences(final AccountGeneralPreferences pref,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java
index 8e65a23..459864a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java
@@ -16,28 +16,39 @@
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.RestReadView;
+import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountDiffPreference;
import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace;
+import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
+import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
public class GetDiffPreferences implements RestReadView<AccountResource> {
-
private final Provider<CurrentUser> self;
+ private final Provider<ReviewDb> db;
@Inject
- GetDiffPreferences(Provider<CurrentUser> self) {
+ GetDiffPreferences(Provider<CurrentUser> self, Provider<ReviewDb> db) {
this.self = self;
+ this.db = db;
}
@Override
- public DiffPreferencesInfo apply(AccountResource rsrc) throws AuthException {
+ public DiffPreferencesInfo apply(AccountResource rsrc)
+ throws AuthException, OrmException {
if (self.get() != rsrc.getUser()
&& !self.get().getCapabilities().canAdministrateServer()) {
throw new AuthException("restricted to administrator");
}
- return DiffPreferencesInfo.parse(rsrc.getUser().getAccountDiffPreference());
+
+ Account.Id userId = rsrc.getUser().getAccountId();
+ AccountDiffPreference a = db.get().accountDiffPreferences().get(userId);
+ if (a == null) {
+ a = new AccountDiffPreference(userId);
+ }
+ return DiffPreferencesInfo.parse(a);
}
static class DiffPreferencesInfo {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java
index 4d3b913..6f30b16 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java
@@ -15,7 +15,9 @@
package com.google.gerrit.server.account;
import com.google.gerrit.extensions.restapi.AuthException;
+import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
+import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences;
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ChangeScreen;
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.CommentVisibilityStrategy;
@@ -24,26 +26,34 @@
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand;
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme;
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.TimeFormat;
+import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
+import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
public class GetPreferences implements RestReadView<AccountResource> {
private final Provider<CurrentUser> self;
+ private final Provider<ReviewDb> db;
@Inject
- GetPreferences(Provider<CurrentUser> self) {
+ GetPreferences(Provider<CurrentUser> self, Provider<ReviewDb> db) {
this.self = self;
+ this.db = db;
}
@Override
- public PreferenceInfo apply(AccountResource rsrc) throws AuthException {
+ public PreferenceInfo apply(AccountResource rsrc)
+ throws AuthException, ResourceNotFoundException, OrmException {
if (self.get() != rsrc.getUser()
&& !self.get().getCapabilities().canAdministrateServer()) {
throw new AuthException("restricted to administrator");
}
- return new PreferenceInfo(rsrc.getUser().getAccount()
- .getGeneralPreferences());
+ Account a = db.get().accounts().get(rsrc.getUser().getAccountId());
+ if (a == null) {
+ throw new ResourceNotFoundException();
+ }
+ return new PreferenceInfo(a.getGeneralPreferences());
}
static class PreferenceInfo {
