Replace AccountGeneralPreferences entity with git backend (phase 1)
Replace the usage of AccountGeneralPreferences with a different class
in extension API package.
To support live migration, the upgrade is done in two steps:
* phase 1 (this change):
o Always write to both git and db
o Introduce new configuration option to indicate whether to read from
git or db, initially set to read from db
o First binary update: some servers are reading/writing just the db;
some servers are additionally writing to git
o After first update: all servers are reading from the db, writing to
both
o Batch copy data from db to git (only related to non open source
Gerrit version)
o Update all servers to read from git. During the update, some will
still be reading from the db; that's ok, because everybody is
writing to git
o OutgoingEmail class is retrieving copy_self_on_email preference
always form the database (by getting AccountGlobalPreferences from
the account cache). This is OK, because all servers are writing to
the database
* phase 2 (next change):
o Bump database version, migrate the data from db to git, delete the
entity (and the flag) from the code and update the servers.
Change-Id: I218d92465665afa0caa01e88ff1fa87f773383eb
This commit is contained in:
David Ostrovsky
committed by
David Ostrovsky
David Ostrovsky
parent
70e4a9024a
commit
cfb7520322
@@ -0,0 +1,138 @@
|
||||
// Copyright (C) 2015 The Android Open Source Project
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.acceptance.rest.account;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import com.google.gerrit.acceptance.AbstractDaemonTest;
|
||||
import com.google.gerrit.acceptance.RestResponse;
|
||||
import com.google.gerrit.acceptance.TestAccount;
|
||||
import com.google.gerrit.extensions.client.GeneralPreferencesInfo;
|
||||
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DateFormat;
|
||||
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DiffView;
|
||||
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DownloadCommand;
|
||||
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.EmailStrategy;
|
||||
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.ReviewCategoryStrategy;
|
||||
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.TimeFormat;
|
||||
import com.google.gerrit.extensions.client.MenuItem;
|
||||
import com.google.gerrit.testutil.ConfigSuite;
|
||||
|
||||
import org.apache.http.HttpStatus;
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class GeneralPreferencesIT extends AbstractDaemonTest {
|
||||
@ConfigSuite.Config
|
||||
public static Config readFromGitConfig() {
|
||||
Config cfg = new Config();
|
||||
cfg.setBoolean("user", null, "readPrefsFromGit", true);
|
||||
return cfg;
|
||||
}
|
||||
|
||||
private TestAccount user42;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
String name = name("user42");
|
||||
user42 = accounts.create(name, name + "@example.com", "User 42");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDiffPreferencesOfNonExistingAccount_NotFound()
|
||||
throws Exception {
|
||||
assertEquals(HttpStatus.SC_NOT_FOUND,
|
||||
adminSession.get("/accounts/non-existing/preferences")
|
||||
.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAndSetPreferences() throws Exception {
|
||||
RestResponse r = adminSession.get("/accounts/" + user42.email
|
||||
+ "/preferences");
|
||||
assertEquals(HttpStatus.SC_OK, r.getStatusCode());
|
||||
GeneralPreferencesInfo d = GeneralPreferencesInfo.defaults();
|
||||
GeneralPreferencesInfo o =
|
||||
newGson().fromJson(r.getReader(), GeneralPreferencesInfo.class);
|
||||
|
||||
assertThat(o.changesPerPage).isEqualTo(d.changesPerPage);
|
||||
assertThat(o.showSiteHeader).isEqualTo(d.showSiteHeader);
|
||||
assertThat(o.useFlashClipboard).isEqualTo(d.useFlashClipboard);
|
||||
assertThat(o.downloadScheme).isNull();
|
||||
assertThat(o.downloadCommand).isEqualTo(d.downloadCommand);
|
||||
assertThat(o.dateFormat).isEqualTo(d.getDateFormat());
|
||||
assertThat(o.timeFormat).isEqualTo(d.getTimeFormat());
|
||||
assertThat(o.emailStrategy).isEqualTo(d.getEmailStrategy());
|
||||
assertThat(o.relativeDateInChangeTable).isNull();
|
||||
assertThat(o.sizeBarInChangeTable).isEqualTo(d.sizeBarInChangeTable);
|
||||
assertThat(o.legacycidInChangeTable).isNull();
|
||||
assertThat(o.muteCommonPathPrefixes).isEqualTo(
|
||||
d.muteCommonPathPrefixes);
|
||||
assertThat(o.reviewCategoryStrategy).isEqualTo(
|
||||
d.getReviewCategoryStrategy());
|
||||
assertThat(o.diffView).isEqualTo(d.getDiffView());
|
||||
|
||||
assertThat(o.my).hasSize(7);
|
||||
assertThat(o.urlAliases).isNull();
|
||||
|
||||
GeneralPreferencesInfo i = GeneralPreferencesInfo.defaults();
|
||||
|
||||
// change all default values
|
||||
i.changesPerPage *= -1;
|
||||
i.showSiteHeader ^= true;
|
||||
i.useFlashClipboard ^= true;
|
||||
i.downloadCommand = DownloadCommand.REPO_DOWNLOAD;
|
||||
i.dateFormat = DateFormat.US;
|
||||
i.timeFormat = TimeFormat.HHMM_24;
|
||||
i.emailStrategy = EmailStrategy.DISABLED;
|
||||
i.relativeDateInChangeTable ^= true;
|
||||
i.sizeBarInChangeTable ^= true;
|
||||
i.legacycidInChangeTable ^= true;
|
||||
i.muteCommonPathPrefixes ^= true;
|
||||
i.reviewCategoryStrategy = ReviewCategoryStrategy.ABBREV;
|
||||
i.diffView = DiffView.UNIFIED_DIFF;
|
||||
i.my = new ArrayList<>();
|
||||
i.my.add(new MenuItem("name", "url"));
|
||||
i.urlAliases = new HashMap<>();
|
||||
i.urlAliases.put("foo", "bar");
|
||||
|
||||
r = adminSession.put("/accounts/" + user42.email + "/preferences", i);
|
||||
assertEquals(HttpStatus.SC_OK, r.getStatusCode());
|
||||
o = newGson().fromJson(r.getReader(), GeneralPreferencesInfo.class);
|
||||
|
||||
assertThat(o.changesPerPage).isEqualTo(i.changesPerPage);
|
||||
assertThat(o.showSiteHeader).isNull();
|
||||
assertThat(o.useFlashClipboard).isNull();
|
||||
assertThat(o.downloadScheme).isNull();
|
||||
assertThat(o.downloadCommand).isEqualTo(i.downloadCommand);
|
||||
assertThat(o.dateFormat).isEqualTo(i.getDateFormat());
|
||||
assertThat(o.timeFormat).isEqualTo(i.getTimeFormat());
|
||||
assertThat(o.emailStrategy).isEqualTo(i.emailStrategy);
|
||||
assertThat(o.relativeDateInChangeTable).isEqualTo(
|
||||
i.relativeDateInChangeTable);
|
||||
assertThat(o.sizeBarInChangeTable).isNull();
|
||||
assertThat(o.legacycidInChangeTable).isEqualTo(i.legacycidInChangeTable);
|
||||
assertThat(o.muteCommonPathPrefixes).isNull();
|
||||
assertThat(o.reviewCategoryStrategy).isEqualTo(
|
||||
i.getReviewCategoryStrategy());
|
||||
assertThat(o.diffView).isEqualTo(i.getDiffView());
|
||||
assertThat(o.my).hasSize(1);
|
||||
assertThat(o.urlAliases).hasSize(1);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user