diff options
author | Marco Miller <marco.miller@ericsson.com> | 2020-10-18 17:16:05 -0400 |
---|---|---|
committer | Marco Miller <marco.miller@ericsson.com> | 2020-10-18 20:08:48 -0400 |
commit | fd685c30c09176169eba8d06d7449b91daa4630b (patch) | |
tree | d255fe4b305f3a5a08d37a407ad9f5d02ad0dbb6 | |
parent | bd64e24f5525770ab421ffed756a113db06286db (diff) | |
parent | c12324a79ec02990266ce720f7c37773cc6ec43c (diff) |
Merge branch 'stable-3.2' into stable-3.3
* stable-3.2:
Update git submodules
Update git submodules
Update git submodules
Update git submodules
Update git submodules
ReceiveCommits: nit - closing bracket in usage String
Update git submodules
TestProjectCreation: add owners setting
MigrateToNoteDb: add option to force state change with skipped project
setNoteDbPrimary: update in chunks, one DB connection per chunk
GC repositories regularly during noteDb migration
NoteDbMigrator: set thread name to show project slice being processed
NoteDbMigrator: shuffle slices to reduce concurrency on same repo
NoteDbMigrator: Fix contention on single database connection
MigrateToNoteDb: implement option --verbose
NoteDbMigrator: log total progress of the migration every 1000 changes
Use multiple threads per project to migrate changes to noteDb
Update Jetty to 9.4.32.v20200930
Change-Id: I51f15e305457ed6ed70c164731d8aee804c2afa9
5 files changed, 32 insertions, 10 deletions
@@ -875,48 +875,48 @@ maven_jar( sha1 = "7e060dd5b19431e6d198e91ff670644372f60fbd", ) -JETTY_VERS = "9.4.30.v20200611" +JETTY_VERS = "9.4.32.v20200930" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS, - sha1 = "ca3dea2cd34ee88cec017001603af0c9e74781d6", + sha1 = "4253dd46c099e0bca4dd763fc1e10774e10de00a", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS, - sha1 = "1a5261f6ad4081ad9e9bb01416d639931d391273", + sha1 = "16a6110fa40e49050146de5f597ab3a3a3fa83b5", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS, - sha1 = "e5ede3724d062717d0c04e4c77f74fe8115c2a6f", + sha1 = "d2d89099be5237cf68254bc943a7d800d3ee1945", ) maven_jar( name = "jetty-jmx", artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS, - sha1 = "653559eaec0f9a335a0d12e90bc764b28f341241", + sha1 = "5e8e87a6f89b8eabf5b5b1765e3d758209001570", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS, - sha1 = "cd6223382e4f82b9ea807d8cdb04a23e5d629f1c", + sha1 = "5fdcefd82178d11f895690f4fe6e843be69394b3", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS, - sha1 = "9c360d08e903b2dbd5d1f8e889a32046948628ce", + sha1 = "0d0f32c3b511d6b3a542787f95ed229731588810", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS, - sha1 = "39ec6aa4745952077f5407cb1394d8ba2db88b13", + sha1 = "efefd29006dcc9c9960a679263504287ce4e6896", ) maven_jar( diff --git a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java index 013829032c..f6e5de32f9 100644 --- a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java +++ b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java @@ -96,7 +96,7 @@ public class ProjectOperationsImpl implements ProjectOperations { args.createEmptyCommit = projectCreation.createEmptyCommit().orElse(true); projectCreation.parent().ifPresent(p -> args.newParent = p); // ProjectCreator wants non-null owner IDs. - args.ownerIds = new ArrayList<>(); + args.ownerIds = new ArrayList<>(projectCreation.owners()); projectCreation.submitType().ifPresent(st -> args.submitType = st); projectCreator.createProject(args); return Project.nameKey(name); diff --git a/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java b/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java index 00759a0004..3337fc33be 100644 --- a/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java +++ b/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java @@ -14,10 +14,13 @@ package com.google.gerrit.acceptance.testsuite.project; +import static java.util.Objects.requireNonNull; + import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.acceptance.testsuite.ThrowingFunction; +import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.client.SubmitType; import java.util.Optional; @@ -39,6 +42,8 @@ public abstract class TestProjectCreation { public abstract Optional<SubmitType> submitType(); + public abstract ImmutableSet<AccountGroup.UUID> owners(); + abstract ThrowingFunction<TestProjectCreation, Project.NameKey> projectCreator(); public static Builder builder( @@ -76,6 +81,13 @@ public abstract class TestProjectCreation { return createEmptyCommit(false); } + public TestProjectCreation.Builder addOwner(AccountGroup.UUID owner) { + ownersBuilder().add(requireNonNull(owner, "owner")); + return this; + } + + abstract ImmutableSet.Builder<AccountGroup.UUID> ownersBuilder(); + abstract TestProjectCreation.Builder projectCreator( ThrowingFunction<TestProjectCreation, Project.NameKey> projectCreator); diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 69db0666b7..4347f8f156 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -1590,7 +1590,7 @@ class ReceiveCommits { name = "--label", aliases = {"-l"}, metaVar = "LABEL+VALUE", - usage = "label(s) to assign (defaults to +1 if no value provided") + usage = "label(s) to assign (defaults to +1 if no value provided)") void addLabel(String token) throws CmdLineException { LabelVote v = LabelVote.parse(token); try { diff --git a/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java b/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java index b88810267a..00d01d6617 100644 --- a/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java +++ b/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java @@ -38,7 +38,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.truth.Correspondence; import com.google.gerrit.acceptance.AbstractDaemonTest; +import com.google.gerrit.acceptance.testsuite.group.GroupOperations; import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.TestPermission; +import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; @@ -57,6 +59,7 @@ import org.junit.Test; public class ProjectOperationsImplTest extends AbstractDaemonTest { @Inject private ProjectOperations projectOperations; + @Inject private GroupOperations groupsOperations; @Test public void defaultName() throws Exception { @@ -122,6 +125,13 @@ public class ProjectOperationsImplTest extends AbstractDaemonTest { } @Test + public void createWithOwners() throws Exception { + AccountGroup.UUID uuid = groupsOperations.newGroup().create(); + Project.NameKey key = projectOperations.newProject().addOwner(uuid).create(); + assertPermissions(key, groupRef(uuid), "refs/*", false, Permission.OWNER); + } + + @Test public void getProjectConfig() throws Exception { Project.NameKey key = projectOperations.newProject().create(); assertThat(projectOperations.project(key).getProjectConfig().getProject().getDescription()) |