Merge "Don't generate SSH keys if not using SSH"
diff --git a/Documentation/metrics.txt b/Documentation/metrics.txt
index 47e2505..229c463 100644
--- a/Documentation/metrics.txt
+++ b/Documentation/metrics.txt
@@ -13,6 +13,13 @@
* `build/label`: Version of Gerrit server software.
* `events`: Triggered events.
+=== Actions
+
+* `action/retry_attempt_counts`: Distribution of number of attempts made
+by RetryHelper to execute an action (1 == single attempt, no retry)
+* `action/retry_timeout_count`: Number of action executions of RetryHelper
+that ultimately timed out
+
=== Process
* `proc/birth_timestamp`: Time at which the Gerrit process started.
@@ -87,10 +94,6 @@
* `batch_update/execute_change_ops`: BatchUpdate change update latency,
excluding reindexing
-* `batch_update/retry_attempt_counts`: Distribution of number of attempts made
-by RetryHelper (1 == single attempt, no retry)
-* `batch_update/retry_timeout_count`: Number of executions of RetryHelper that
-ultimately timed out
=== NoteDb
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index 9d551c4..49b9450 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -15,6 +15,7 @@
"//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util",
"//java/com/google/gerrit/gpg/testing:gpg-test-util",
"//java/com/google/gerrit/httpd",
+ "//java/com/google/gerrit/index",
"//java/com/google/gerrit/launcher",
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/metrics",
diff --git a/java/com/google/gerrit/server/account/AccountsUpdate.java b/java/com/google/gerrit/server/account/AccountsUpdate.java
index 85550aa..ee3cf87f 100644
--- a/java/com/google/gerrit/server/account/AccountsUpdate.java
+++ b/java/com/google/gerrit/server/account/AccountsUpdate.java
@@ -38,6 +38,7 @@
import com.google.gerrit.server.mail.send.OutgoingEmailValidator;
import com.google.gerrit.server.update.RefUpdateUtil;
import com.google.gerrit.server.update.RetryHelper;
+import com.google.gerrit.server.update.RetryHelper.ActionType;
import com.google.gwtorm.server.OrmDuplicateKeyException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -473,6 +474,7 @@
private Account deleteAccount(Account.Id accountId)
throws IOException, OrmException, ConfigInvalidException {
return retryHelper.execute(
+ ActionType.ACCOUNT_UPDATE,
() -> {
deleteUserBranch(accountId);
return null;
@@ -525,6 +527,7 @@
private Account updateAccount(AccountUpdate accountUpdate)
throws IOException, ConfigInvalidException, OrmException {
return retryHelper.execute(
+ ActionType.ACCOUNT_UPDATE,
() -> {
try (Repository allUsersRepo = repoManager.openRepository(allUsersName)) {
UpdatedAccount updatedAccount = accountUpdate.update(allUsersRepo);
diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java b/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java
index 8a05a6c..028fd8d 100644
--- a/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java
+++ b/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java
@@ -28,6 +28,7 @@
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.update.RetryHelper;
+import com.google.gerrit.server.update.RetryHelper.ActionType;
import com.google.gwtorm.server.OrmDuplicateKeyException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -427,6 +428,7 @@
private void updateNoteMap(ExternalIdUpdater updater)
throws IOException, ConfigInvalidException, OrmException {
retryHelper.execute(
+ ActionType.ACCOUNT_UPDATE,
() -> {
try (Repository repo = repoManager.openRepository(allUsersName)) {
ExternalIdNotes extIdNotes =
diff --git a/java/com/google/gerrit/server/change/GetRelated.java b/java/com/google/gerrit/server/change/GetRelated.java
index 44f65e1..3728b9f 100644
--- a/java/com/google/gerrit/server/change/GetRelated.java
+++ b/java/com/google/gerrit/server/change/GetRelated.java
@@ -14,11 +14,15 @@
package com.google.gerrit.server.change;
+import static java.util.stream.Collectors.toSet;
+
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.common.CommitInfo;
import com.google.gerrit.extensions.restapi.RestReadView;
+import com.google.gerrit.index.IndexConfig;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
@@ -38,7 +42,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
@@ -50,17 +53,20 @@
private final Provider<InternalChangeQuery> queryProvider;
private final PatchSetUtil psUtil;
private final RelatedChangesSorter sorter;
+ private final IndexConfig indexConfig;
@Inject
GetRelated(
Provider<ReviewDb> db,
Provider<InternalChangeQuery> queryProvider,
PatchSetUtil psUtil,
- RelatedChangesSorter sorter) {
+ RelatedChangesSorter sorter,
+ IndexConfig indexConfig) {
this.db = db;
this.queryProvider = queryProvider;
this.psUtil = psUtil;
this.sorter = sorter;
+ this.indexConfig = indexConfig;
}
@Override
@@ -74,16 +80,14 @@
private List<ChangeAndCommit> getRelated(RevisionResource rsrc)
throws OrmException, IOException, PermissionBackendException {
- Set<String> groups = getAllGroups(rsrc.getNotes());
+ Set<String> groups = getAllGroups(rsrc.getNotes(), db.get(), psUtil);
if (groups.isEmpty()) {
return Collections.emptyList();
}
List<ChangeData> cds =
- queryProvider
- .get()
- .enforceVisibility(true)
- .byProjectGroups(rsrc.getChange().getProject(), groups);
+ InternalChangeQuery.byProjectGroups(
+ queryProvider, indexConfig, rsrc.getChange().getProject(), groups);
if (cds.isEmpty()) {
return Collections.emptyList();
}
@@ -119,12 +123,14 @@
return result;
}
- private Set<String> getAllGroups(ChangeNotes notes) throws OrmException {
- Set<String> result = new HashSet<>();
- for (PatchSet ps : psUtil.byChange(db.get(), notes)) {
- result.addAll(ps.getGroups());
- }
- return result;
+ @VisibleForTesting
+ public static Set<String> getAllGroups(ChangeNotes notes, ReviewDb db, PatchSetUtil psUtil)
+ throws OrmException {
+ return psUtil
+ .byChange(db, notes)
+ .stream()
+ .flatMap(ps -> ps.getGroups().stream())
+ .collect(toSet());
}
private void reloadChangeIfStale(List<ChangeData> cds, PatchSet wantedPs) throws OrmException {
diff --git a/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java
index 2759de0..a292f9e 100644
--- a/java/com/google/gerrit/server/events/EventFactory.java
+++ b/java/com/google/gerrit/server/events/EventFactory.java
@@ -23,6 +23,7 @@
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.common.data.SubmitRecord;
+import com.google.gerrit.index.IndexConfig;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Change;
@@ -93,6 +94,7 @@
private final ChangeKindCache changeKindCache;
private final Provider<InternalChangeQuery> queryProvider;
private final SchemaFactory<ReviewDb> schema;
+ private final IndexConfig indexConfig;
@Inject
EventFactory(
@@ -105,7 +107,8 @@
ApprovalsUtil approvalsUtil,
ChangeKindCache changeKindCache,
Provider<InternalChangeQuery> queryProvider,
- SchemaFactory<ReviewDb> schema) {
+ SchemaFactory<ReviewDb> schema,
+ IndexConfig indexConfig) {
this.accountCache = accountCache;
this.emails = emails;
this.urlProvider = urlProvider;
@@ -116,6 +119,7 @@
this.changeKindCache = changeKindCache;
this.queryProvider = queryProvider;
this.schema = schema;
+ this.indexConfig = indexConfig;
}
/**
@@ -313,7 +317,8 @@
// Find changes in the same related group as this patch set, having a patch
// set whose parent matches this patch set's revision.
for (ChangeData cd :
- queryProvider.get().byProjectGroups(change.getProject(), currentPs.getGroups())) {
+ InternalChangeQuery.byProjectGroups(
+ queryProvider, indexConfig, change.getProject(), currentPs.getGroups())) {
PATCH_SETS:
for (PatchSet ps : cd.patchSets()) {
RevCommit commit = rw.parseCommit(ObjectId.fromString(ps.getRevision().get()));
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index f4f68a1..a058aec 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -148,6 +148,7 @@
import com.google.gerrit.server.update.RepoContext;
import com.google.gerrit.server.update.RepoOnlyOp;
import com.google.gerrit.server.update.RetryHelper;
+import com.google.gerrit.server.update.RetryHelper.ActionType;
import com.google.gerrit.server.update.UpdateException;
import com.google.gerrit.server.util.LabelVote;
import com.google.gerrit.server.util.MagicBranch;
@@ -2868,7 +2869,11 @@
for (Ref ref : byCommit.get(c.copy())) {
PatchSet.Id psId = PatchSet.Id.fromRef(ref.getName());
- Optional<ChangeData> cd = byLegacyId(psId.getParentKey());
+ Optional<ChangeData> cd =
+ retryHelper.execute(
+ ActionType.CHANGE_QUERY,
+ () -> byLegacyId(psId.getParentKey()),
+ t -> t instanceof OrmException);
if (cd.isPresent() && cd.get().change().getDest().equals(branch)) {
existingPatchSets++;
bu.addOp(
@@ -2880,7 +2885,11 @@
for (String changeId : c.getFooterLines(CHANGE_ID)) {
if (byKey == null) {
- byKey = openChangesByKeyByBranch(branch);
+ byKey =
+ retryHelper.execute(
+ ActionType.CHANGE_QUERY,
+ () -> openChangesByKeyByBranch(branch),
+ t -> t instanceof OrmException);
}
ChangeNotes onto = byKey.get(new Change.Key(changeId.trim()));
@@ -2926,7 +2935,10 @@
logError("Failed to auto-close changes", e);
}
return null;
- });
+ },
+ // Use a multiple of the default timeout to account for inner retries that may otherwise
+ // eat up the whole timeout so that no time is left to retry this outer action.
+ RetryHelper.options().timeout(retryHelper.getDefaultTimeout().multipliedBy(5)).build());
} catch (RestApiException e) {
logError("Can't insert patchset", e);
} catch (UpdateException e) {
diff --git a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
index e7ccc5a..6e63a32 100644
--- a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
+++ b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
@@ -22,6 +22,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.gerrit.index.FieldDef;
@@ -37,10 +38,12 @@
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.eclipse.jgit.lib.ObjectId;
@@ -275,12 +278,39 @@
return query(new SubmissionIdPredicate(cs));
}
- public List<ChangeData> byProjectGroups(Project.NameKey project, Collection<String> groups)
+ private List<ChangeData> byProjectGroups(Project.NameKey project, Collection<String> groups)
throws OrmException {
+ int n = indexConfig.maxTerms() - 1;
+ checkArgument(groups.size() <= n, "cannot exceed %s groups", n);
List<GroupPredicate> groupPredicates = new ArrayList<>(groups.size());
for (String g : groups) {
groupPredicates.add(new GroupPredicate(g));
}
return query(and(project(project), or(groupPredicates)));
}
+
+ // Batching via multiple queries requires passing in a Provider since the underlying
+ // QueryProcessor instance is not reusable.
+ public static List<ChangeData> byProjectGroups(
+ Provider<InternalChangeQuery> queryProvider,
+ IndexConfig indexConfig,
+ Project.NameKey project,
+ Collection<String> groups)
+ throws OrmException {
+ int batchSize = indexConfig.maxTerms() - 1;
+ if (groups.size() <= batchSize) {
+ return queryProvider.get().enforceVisibility(true).byProjectGroups(project, groups);
+ }
+ Set<Change.Id> seen = new HashSet<>();
+ List<ChangeData> result = new ArrayList<>();
+ for (List<String> part : Iterables.partition(groups, batchSize)) {
+ for (ChangeData cd :
+ queryProvider.get().enforceVisibility(true).byProjectGroups(project, part)) {
+ if (!seen.add(cd.getId())) {
+ result.add(cd);
+ }
+ }
+ }
+ return result;
+ }
}
diff --git a/java/com/google/gerrit/server/update/RetryHelper.java b/java/com/google/gerrit/server/update/RetryHelper.java
index 54726fe..0f5b00f 100644
--- a/java/com/google/gerrit/server/update/RetryHelper.java
+++ b/java/com/google/gerrit/server/update/RetryHelper.java
@@ -32,9 +32,10 @@
import com.google.common.base.Throwables;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.restapi.RestApiException;
-import com.google.gerrit.metrics.Counter0;
+import com.google.gerrit.metrics.Counter1;
import com.google.gerrit.metrics.Description;
-import com.google.gerrit.metrics.Histogram0;
+import com.google.gerrit.metrics.Field;
+import com.google.gerrit.metrics.Histogram1;
import com.google.gerrit.metrics.MetricMaker;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.LockFailureException;
@@ -61,6 +62,12 @@
T call() throws Exception;
}
+ public enum ActionType {
+ ACCOUNT_UPDATE,
+ CHANGE_QUERY,
+ CHANGE_UPDATE
+ }
+
/**
* Options for retrying a single operation.
*
@@ -96,25 +103,29 @@
@VisibleForTesting
@Singleton
public static class Metrics {
- final Histogram0 attemptCounts;
- final Counter0 timeoutCount;
+ final Histogram1<ActionType> attemptCounts;
+ final Counter1<ActionType> timeoutCount;
@Inject
Metrics(MetricMaker metricMaker) {
+ Field<ActionType> view = Field.ofEnum(ActionType.class, "action_type");
attemptCounts =
metricMaker.newHistogram(
- "batch_update/retry_attempt_counts",
+ "action/retry_attempt_counts",
new Description(
- "Distribution of number of attempts made by RetryHelper"
+ "Distribution of number of attempts made by RetryHelper to execute an action"
+ " (1 == single attempt, no retry)")
.setCumulative()
- .setUnit("attempts"));
+ .setUnit("attempts"),
+ view);
timeoutCount =
metricMaker.newCounter(
- "batch_update/retry_timeout_count",
- new Description("Number of executions of RetryHelper that ultimately timed out")
+ "action/retry_timeout_count",
+ new Description(
+ "Number of action executions of RetryHelper that ultimately timed out")
.setCumulative()
- .setUnit("timeouts"));
+ .setUnit("timeouts"),
+ view);
}
}
@@ -171,9 +182,16 @@
return defaultTimeout;
}
- public <T> T execute(Action<T> action) throws IOException, ConfigInvalidException, OrmException {
+ public <T> T execute(ActionType actionType, Action<T> action)
+ throws IOException, ConfigInvalidException, OrmException {
+ return execute(actionType, action, t -> t instanceof LockFailureException);
+ }
+
+ public <T> T execute(
+ ActionType actionType, Action<T> action, Predicate<Throwable> exceptionPredicate)
+ throws IOException, ConfigInvalidException, OrmException {
try {
- return execute(action, defaults(), t -> t instanceof LockFailureException);
+ return execute(actionType, action, defaults(), exceptionPredicate);
} catch (Throwable t) {
Throwables.throwIfUnchecked(t);
Throwables.throwIfInstanceOf(t, IOException.class);
@@ -195,10 +213,13 @@
// transactions. Either way, retrying a partially-failed operation is not idempotent, so
// don't do it automatically. Let the end user decide whether they want to retry.
return execute(
- () -> changeAction.call(updateFactory), RetryerBuilder.<T>newBuilder().build());
+ ActionType.CHANGE_UPDATE,
+ () -> changeAction.call(updateFactory),
+ RetryerBuilder.<T>newBuilder().build());
}
return execute(
+ ActionType.CHANGE_UPDATE,
() -> changeAction.call(updateFactory),
opts,
t -> {
@@ -218,6 +239,7 @@
/**
* Executes an action with a given retryer.
*
+ * @param actionType the type of the action
* @param action the action which should be executed and retried on failure
* @param opts options for retrying the action on failure
* @param exceptionPredicate predicate to control on which exception the action should be retried
@@ -225,33 +247,39 @@
* @throws Throwable any error or exception that made the action fail, callers are expected to
* catch and inspect this Throwable to decide carefully whether it should be re-thrown
*/
- private <T> T execute(Action<T> action, Options opts, Predicate<Throwable> exceptionPredicate)
+ private <T> T execute(
+ ActionType actionType,
+ Action<T> action,
+ Options opts,
+ Predicate<Throwable> exceptionPredicate)
throws Throwable {
MetricListener listener = new MetricListener();
try {
RetryerBuilder<T> retryerBuilder = createRetryerBuilder(opts, exceptionPredicate);
retryerBuilder.withRetryListener(listener);
- return execute(action, retryerBuilder.build());
+ return execute(actionType, action, retryerBuilder.build());
} finally {
- metrics.attemptCounts.record(listener.getAttemptCount());
+ metrics.attemptCounts.record(actionType, listener.getAttemptCount());
}
}
/**
* Executes an action with a given retryer.
*
+ * @param actionType the type of the action
* @param action the action which should be executed and retried on failure
* @param retryer the retryer
* @return the result of executing the action
* @throws Throwable any error or exception that made the action fail, callers are expected to
* catch and inspect this Throwable to decide carefully whether it should be re-thrown
*/
- private <T> T execute(Action<T> action, Retryer<T> retryer) throws Throwable {
+ private <T> T execute(ActionType actionType, Action<T> action, Retryer<T> retryer)
+ throws Throwable {
try {
return retryer.call(() -> action.call());
} catch (ExecutionException | RetryException e) {
if (e instanceof RetryException) {
- metrics.timeoutCount.increment();
+ metrics.timeoutCount.increment(actionType);
}
if (e.getCause() != null) {
throw e.getCause();
diff --git a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
index eed8feb..615fee0 100644
--- a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
@@ -15,6 +15,7 @@
package com.google.gerrit.acceptance.server.change;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.acceptance.GitUtil.assertPushOk;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
import static com.google.gerrit.extensions.common.testing.EditInfoSubject.assertThat;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -29,20 +30,26 @@
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.common.CommitInfo;
import com.google.gerrit.extensions.common.EditInfo;
+import com.google.gerrit.index.IndexConfig;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.server.change.ChangesCollection;
+import com.google.gerrit.server.change.GetRelated;
import com.google.gerrit.server.change.GetRelated.ChangeAndCommit;
import com.google.gerrit.server.change.GetRelated.RelatedInfo;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.update.BatchUpdateOp;
import com.google.gerrit.server.update.ChangeContext;
+import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.TestTimeUtil;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
+import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import org.eclipse.jgit.junit.TestRepository;
+import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.After;
@@ -50,6 +57,15 @@
import org.junit.Test;
public class GetRelatedIT extends AbstractDaemonTest {
+ private static final int MAX_TERMS = 10;
+
+ @ConfigSuite.Default
+ public static Config defaultConfig() {
+ Config cfg = new Config();
+ cfg.setInt("index", null, "maxTerms", MAX_TERMS);
+ return cfg;
+ }
+
private String systemTimeZone;
@Before
@@ -64,6 +80,7 @@
System.setProperty("user.timezone", systemTimeZone);
}
+ @Inject private IndexConfig indexConfig;
@Inject private ChangesCollection changes;
@Test
@@ -539,6 +556,27 @@
assertRelated(psId2_2, changeAndCommit(psId2_2, c2_2, 2), changeAndCommit(psId1_1, c1_1, 1));
}
+ @Test
+ public void getRelatedManyGroups() throws Exception {
+ List<RevCommit> commits = new ArrayList<>();
+ RevCommit last = null;
+ int n = 2 * MAX_TERMS;
+ assertThat(n).isGreaterThan(indexConfig.maxTerms());
+ for (int i = 1; i <= n; i++) {
+ TestRepository<?>.CommitBuilder cb = last != null ? amendBuilder() : commitBuilder();
+ last = cb.add("a.txt", Integer.toString(i)).message("subject: " + i).create();
+ testRepo.reset(last);
+ assertPushOk(pushHead(testRepo, "refs/for/master", false), "refs/for/master");
+ commits.add(last);
+ }
+
+ ChangeData cd = getChange(last);
+ assertThat(cd.patchSets().size()).isEqualTo(n);
+ assertThat(GetRelated.getAllGroups(cd.notes(), db, psUtil).size()).isEqualTo(n);
+
+ assertRelated(cd.change().currentPatchSetId());
+ }
+
private List<ChangeAndCommit> getRelated(PatchSet.Id ps) throws Exception {
return getRelated(ps.getParentKey(), ps.get());
}
diff --git a/resources/com/google/gerrit/httpd/auth/ldap/LoginForm.html b/resources/com/google/gerrit/httpd/auth/ldap/LoginForm.html
index c5e38b3..39900e8 100644
--- a/resources/com/google/gerrit/httpd/auth/ldap/LoginForm.html
+++ b/resources/com/google/gerrit/httpd/auth/ldap/LoginForm.html
@@ -21,7 +21,7 @@
<div id="gerrit_body" class="gerritBody">
<h1>Sign In to Gerrit Code Review at <span id="hostName">example.com</span></h1>
<div id="error_message">Invalid username or password.</div>
- <form method="POST" action="#" id="login_form">
+ <form method="POST" action="#" id="login_form" onsubmit="return shouldSubmit()">
<table style="border: 0;">
<tr>
<th>Username</th>
@@ -50,7 +50,7 @@
<tr>
<td></td>
<td>
- <input type="submit" value="Sign In" tabindex="4"/>
+ <input id="b_signin" type="submit" value="Sign In" tabindex="4"/>
<a href="../" id="cancel_link">Cancel</a>
</td>
</tr>
@@ -62,6 +62,17 @@
</div>
<script type="text/javascript">
+ <![CDATA[
+ var submitted = false;
+ function shouldSubmit() {
+ if(!submitted) {
+ submitted = true;
+ document.getElementById('b_signin').disabled=true;
+ return true;
+ }
+ return false;
+ }
+
var login_form = document.getElementById('login_form');
var f_user = document.getElementById('f_user');
var f_pass = document.getElementById('f_pass');
@@ -75,12 +86,13 @@
}
}
f_pass.onkeyup = function(e) {
- if (e.keyCode == 13) {
+ if (e.keyCode == 13 && shouldSubmit()) {
login_form.submit();
return false;
}
}
f_user.focus();
+ ]]>
</script>
</body>
</html>
