opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  Restore existing Base64 transcoder for private key
  Remove unused annotation @ChangeUpdateExecutor

Change-Id: I911b54160e966ebc2a18e9762c494e2759aa7396
This commit is contained in:
Luca Milanesio
2020-05-01 14:22:58 +01:00
parent 584ce3bf29 b633dfc671
commit 46c0d503e9
5 changed files with 36 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
java/com/google/gerrit/server/config/ChangeUpdateExecutor.java
View File

@@ -1,29 +0,0 @@
// Copyright (C) 2012 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.server.config;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.inject.BindingAnnotation;
import java.lang.annotation.Retention;
/**
* Marker on the global {@link ListeningExecutorService} used by asynchronous {@link BatchUpdate}s.
*/
@Retention(RUNTIME)
@BindingAnnotation
public @interface ChangeUpdateExecutor {}

30
java/com/google/gerrit/server/config/SysExecutorModule.java
View File

@@ -14,19 +14,13 @@
package com.google.gerrit.server.config;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gerrit.server.FanOutExecutor;
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.logging.LoggingContextAwareExecutorService;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.lib.Config;
/**
@@ -73,28 +67,4 @@ public class SysExecutorModule extends AbstractModule {
}
return queues.createQueue(poolSize, "FanOut");
}
@Provides
@Singleton
@ChangeUpdateExecutor
public ListeningExecutorService createChangeUpdateExecutor(@GerritServerConfig Config config) {
int poolSize = config.getInt("receive", null, "changeUpdateThreads", 1);
if (poolSize <= 1) {
return MoreExecutors.newDirectExecutorService();
}
return MoreExecutors.listeningDecorator(
new LoggingContextAwareExecutorService(
MoreExecutors.getExitingExecutorService(
new ThreadPoolExecutor(
1,
poolSize,
10,
TimeUnit.MINUTES,
new ArrayBlockingQueue<>(poolSize),
new ThreadFactoryBuilder()
.setNameFormat("ChangeUpdate-%d")
.setDaemon(true)
.build(),
new ThreadPoolExecutor.CallerRunsPolicy()))));
}
}