Support temporarily read-only changes via NoteDbChangeState
Add a new piece of data to NoteDbChangeState indicating that a change is read-only until a specified future time. We use a timestamp instead of a separate state to support a migration step where the job doing the migration might die, so the change automatically becomes read-write again without manual intervention. This read-only state only needs to be checked while updating ReviewDb, which includes an atomic update to the noteDbState field. There are exactly two locations that do this atomic update: ChangeRebuilderImpl#execute and BatchUpdate.ChangeTask#call. We don't bother with attempting to double-check this field when doing the corresponding NoteDb write, for example from NoteDbUpdateManager. It's not possible when we're about to write to NoteDb to do a race-free atomic read of both the read-only state from ReviewDb and the ref in NoteDb that we're about to update. So, we just let the NoteDb write attempt proceed. This turns out to not affect the correctness of the migration process; the race condition is explained in more detail in the commit that implements the migration process. Change-Id: If21353582f678b8788285bc2e9f7b50a5c14f6d4
This commit is contained in:
@@ -15,11 +15,15 @@
|
||||
package com.google.gerrit.acceptance.server.notedb;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static com.google.common.truth.Truth.assert_;
|
||||
import static com.google.common.truth.TruthJUnit.assume;
|
||||
import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef;
|
||||
import static com.google.gerrit.reviewdb.client.RefNames.refsDraftComments;
|
||||
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static java.util.concurrent.TimeUnit.DAYS;
|
||||
import static java.util.concurrent.TimeUnit.MILLISECONDS;
|
||||
import static java.util.concurrent.TimeUnit.SECONDS;
|
||||
import static java.util.stream.Collectors.toList;
|
||||
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
|
||||
import static org.junit.Assert.fail;
|
||||
@@ -83,6 +87,7 @@ import com.google.gerrit.testutil.NoteDbMode;
|
||||
import com.google.gerrit.testutil.TestChanges;
|
||||
import com.google.gerrit.testutil.TestTimeUtil;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.gwtorm.server.OrmRuntimeException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
@@ -158,7 +163,7 @@ public class ChangeRebuilderIT extends AbstractDaemonTest {
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
assume().that(NoteDbMode.readWrite()).isFalse();
|
||||
TestTimeUtil.resetWithClockStep(1, TimeUnit.SECONDS);
|
||||
TestTimeUtil.resetWithClockStep(1, SECONDS);
|
||||
setNotesMigration(false, false);
|
||||
}
|
||||
|
||||
@@ -630,7 +635,8 @@ public class ChangeRebuilderIT extends AbstractDaemonTest {
|
||||
Optional.of(
|
||||
NoteDbChangeState.RefState.create(
|
||||
NoteDbChangeState.parse(c).getChangeMetaId(),
|
||||
ImmutableMap.of(user.getId(), badSha))));
|
||||
ImmutableMap.of(user.getId(), badSha))),
|
||||
Optional.empty());
|
||||
c.setNoteDbState(bogusState.toString());
|
||||
db.changes().update(Collections.singleton(c));
|
||||
|
||||
@@ -1180,6 +1186,37 @@ public class ChangeRebuilderIT extends AbstractDaemonTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void rebuilderRespectsReadOnlyInNoteDbChangeState() throws Exception {
|
||||
TestTimeUtil.resetWithClockStep(1, SECONDS);
|
||||
PushOneCommit.Result r = createChange();
|
||||
PatchSet.Id psId1 = r.getPatchSetId();
|
||||
Change.Id id = psId1.getParentKey();
|
||||
|
||||
checker.rebuildAndCheckChanges(id);
|
||||
setNotesMigration(true, true);
|
||||
|
||||
ReviewDb db = getUnwrappedDb();
|
||||
Change c = db.changes().get(id);
|
||||
NoteDbChangeState state = NoteDbChangeState.parse(c);
|
||||
Timestamp until =
|
||||
new Timestamp(TimeUtil.nowMs() + MILLISECONDS.convert(1, DAYS));
|
||||
state = state.withReadOnlyUntil(until);
|
||||
c.setNoteDbState(state.toString());
|
||||
db.changes().update(Collections.singleton(c));
|
||||
|
||||
try {
|
||||
rebuilderWrapper.rebuild(db, id);
|
||||
assert_().fail("expected rebuild to fail");
|
||||
} catch (OrmRuntimeException e) {
|
||||
assertThat(e.getMessage()).contains("read-only until");
|
||||
}
|
||||
|
||||
TestTimeUtil.setClock(
|
||||
new Timestamp(until.getTime() + MILLISECONDS.convert(1, SECONDS)));
|
||||
rebuilderWrapper.rebuild(db, id);
|
||||
}
|
||||
|
||||
private void assertChangesReadOnly(RestApiException e) throws Exception {
|
||||
Throwable cause = e.getCause();
|
||||
assertThat(cause).isInstanceOf(UpdateException.class);
|
||||
|
@@ -15,19 +15,23 @@
|
||||
package com.google.gerrit.acceptance.server.notedb;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static com.google.common.truth.Truth.assert_;
|
||||
import static com.google.common.truth.TruthJUnit.assume;
|
||||
import static com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage.REVIEW_DB;
|
||||
import static java.util.stream.Collectors.toList;
|
||||
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.common.collect.Iterables;
|
||||
import com.google.gerrit.acceptance.AbstractDaemonTest;
|
||||
import com.google.gerrit.acceptance.PushOneCommit;
|
||||
import com.google.gerrit.common.TimeUtil;
|
||||
import com.google.gerrit.extensions.api.changes.DraftInput;
|
||||
import com.google.gerrit.extensions.api.changes.ReviewInput;
|
||||
import com.google.gerrit.extensions.client.ChangeStatus;
|
||||
import com.google.gerrit.extensions.common.ApprovalInfo;
|
||||
import com.google.gerrit.extensions.common.ChangeInfo;
|
||||
import com.google.gerrit.extensions.common.CommentInfo;
|
||||
import com.google.gerrit.extensions.restapi.RestApiException;
|
||||
import com.google.gerrit.reviewdb.client.Account;
|
||||
import com.google.gerrit.reviewdb.client.Change;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDbUtil;
|
||||
@@ -36,15 +40,21 @@ import com.google.gerrit.server.git.RepoRefCache;
|
||||
import com.google.gerrit.server.notedb.ChangeNotes;
|
||||
import com.google.gerrit.server.notedb.NoteDbChangeState;
|
||||
import com.google.gerrit.testutil.NoteDbMode;
|
||||
import com.google.gerrit.testutil.TestTimeUtil;
|
||||
import com.google.gwtorm.server.OrmRuntimeException;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class NoteDbPrimaryIT extends AbstractDaemonTest {
|
||||
@Inject
|
||||
@@ -54,6 +64,12 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest {
|
||||
public void setUp() throws Exception {
|
||||
assume().that(NoteDbMode.get()).isEqualTo(NoteDbMode.READ_WRITE);
|
||||
db = ReviewDbUtil.unwrapDb(db);
|
||||
TestTimeUtil.resetWithClockStep(1, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
TestTimeUtil.useSystemTime();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -162,6 +178,56 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest {
|
||||
assertThat(getReviewers(id)).isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readOnlyReviewDb() throws Exception {
|
||||
PushOneCommit.Result r = createChange();
|
||||
Change.Id id = r.getChange().getId();
|
||||
testReadOnly(id);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readOnlyNoteDb() throws Exception {
|
||||
PushOneCommit.Result r = createChange();
|
||||
Change.Id id = r.getChange().getId();
|
||||
setNoteDbPrimary(id);
|
||||
testReadOnly(id);
|
||||
}
|
||||
|
||||
private void testReadOnly(Change.Id id) throws Exception {
|
||||
Timestamp before = TimeUtil.nowTs();
|
||||
Timestamp until = new Timestamp(before.getTime() + 1000 * 3600);
|
||||
|
||||
// Set read-only.
|
||||
Change c = db.changes().get(id);
|
||||
assertThat(c).named("change " + id).isNotNull();
|
||||
NoteDbChangeState state = NoteDbChangeState.parse(c);
|
||||
state = state.withReadOnlyUntil(until);
|
||||
c.setNoteDbState(state.toString());
|
||||
db.changes().update(Collections.singleton(c));
|
||||
|
||||
assertThat(gApi.changes().id(id.get()).get().subject)
|
||||
.isEqualTo(PushOneCommit.SUBJECT);
|
||||
assertThat(gApi.changes().id(id.get()).get().topic).isNull();
|
||||
try {
|
||||
gApi.changes().id(id.get()).topic("a-topic");
|
||||
assert_().fail("expected read-only exception");
|
||||
} catch (RestApiException e) {
|
||||
Optional<Throwable> oe = Throwables.getCausalChain(e).stream()
|
||||
.filter(x -> x instanceof OrmRuntimeException).findFirst();
|
||||
assertThat(oe.isPresent())
|
||||
.named("OrmRuntimeException in causal chain of " + e)
|
||||
.isTrue();
|
||||
assertThat(oe.get().getMessage()).contains("read-only");
|
||||
}
|
||||
assertThat(gApi.changes().id(id.get()).get().topic).isNull();
|
||||
|
||||
TestTimeUtil.setClock(new Timestamp(until.getTime() + 1000));
|
||||
assertThat(gApi.changes().id(id.get()).get().subject)
|
||||
.isEqualTo(PushOneCommit.SUBJECT);
|
||||
gApi.changes().id(id.get()).topic("a-topic");
|
||||
assertThat(gApi.changes().id(id.get()).get().topic).isEqualTo("a-topic");
|
||||
}
|
||||
|
||||
private void setNoteDbPrimary(Change.Id id) throws Exception {
|
||||
Change c = db.changes().get(id);
|
||||
assertThat(c).named("change " + id).isNotNull();
|
||||
|
Reference in New Issue
Block a user