commit 7649b84b5204364123d0a953e269e68e9c8aef29
author Luca Milanesio <luca.milanesio@gmail.com> Thu Apr 23 15:26:58 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 23 15:26:58 2020 +0000
tree b6f9934e2f5c4c5b21a0a7adb3172f1c5f4ceaa6
parent e0a5b6c5474a7f6af2ace350e16b9adad85c9224
parent 7b7c48059b78b7964b0772b42663de28c627401d

Merge "Clarify the limitations of gerrit+ssh in replication.config" into stable-2.16

src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
index cbd5887..5a45be9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -628,7 +628,7 @@
 
   boolean wouldPushRef(String ref) {
     if (!config.replicatePermissions() && RefNames.REFS_CONFIG.equals(ref)) {
-      repLog.atFine().log("NOT pushing ref %s; meta ref", ref);
+      repLog.atFine().log("Skipping push of ref %s; it is a meta ref", ref);
       return false;
     }
     for (RefSpec s : config.getRemoteConfig().getPushRefSpecs()) {
@@ -636,7 +636,7 @@
         return true;
       }
     }
-    repLog.atFine().log("NOT pushing ref %s; does not match push ref specs", ref);
+    repLog.atFine().log("Skipping push of ref %s; it does not match push ref specs", ref);
     return false;
   }
 

src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
index 1838e5c..c974f3a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -448,8 +448,7 @@
     updateStates(res.getRemoteUpdates());
   }
 
-  private PushResult pushVia(Transport tn)
-      throws IOException, NotSupportedException, TransportException, PermissionBackendException {
+  private PushResult pushVia(Transport tn) throws IOException, PermissionBackendException {
     tn.applyConfig(config);
     tn.setCredentialsProvider(credentialsProvider);
 
@@ -462,7 +461,7 @@
       return new PushResult();
     }
 
-    repLog.atSevere().log("Push to %s references: %s", uri, todo);
+    repLog.atInfo().log("Push to %s references: %s", uri, todo);
 
     return tn.push(NullProgressMonitor.INSTANCE, todo);
   }
@@ -509,13 +508,13 @@
         : replicationPushFilter.get().filter(projectName.get(), remoteUpdatesList);
   }
 
-  private List<RemoteRefUpdate> doPushAll(Transport tn, Map<String, Ref> local)
-      throws NotSupportedException, TransportException, IOException {
+  private List<RemoteRefUpdate> doPushAll(Transport tn, Map<String, Ref> local) throws IOException {
     List<RemoteRefUpdate> cmds = new ArrayList<>();
     boolean noPerms = !pool.isReplicatePermissions();
     Map<String, Ref> remote = listRemote(tn);
     for (Ref src : local.values()) {
       if (!canPushRef(src.getName(), noPerms)) {
+        repLog.atFine().log("Skipping push of ref %s", src.getName());
         continue;
       }