WIP: Test parallel user scanning and more

.github/workflows/publish-release-artifact.yml

@@ -74,7 +74,7 @@ jobs:
           wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
       - name: Upload Release Asset
         id: upload-war
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
+        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -109,7 +109,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
+        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -146,7 +146,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
+        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -182,7 +182,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
+        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

Jenkinsfile

@@ -14,8 +14,8 @@ properties([
 ])
 
 def axes = [
-  platforms: ['linux', 'windows'],
-  jdks: [21, 25],
+  platforms: ['linux'],
+  jdks: [21],
 ]
 
 stage('Record build') {
@@ -124,7 +124,12 @@ axes.values().combinations {
             }
             withChecks(name: 'Tests', includeStage: true) {
               realtimeJUnit(healthScaleFactor: 20.0, testResults: '*/target/surefire-reports/*.xml') {
+                // Only use with replay, not with a commit
+                // sh 'curl -O https://home.markwaite.net/~mwaite/pom.patch && git apply pom.patch && rm pom.patch && git diff'
+                // mavenOptions.add(0, "-Dignore.dirt")
                 infra.runMaven(mavenOptions, jdk)
+                // Only use with replay, not with a commit
+                // sh 'git checkout -- */pom.xml'
                 if (isUnix()) {
                   sh 'git add . && git diff --exit-code HEAD'
                 }
@@ -212,41 +217,6 @@ axes.values().combinations {
   }
 }
 
-def athAxes = [
-  platforms: ['linux'],
-  jdks: [21],
-  browsers: ['firefox'],
-]
-athAxes.values().combinations {
-  def (platform, jdk, browser) = it
-  builds["ath-${platform}-jdk${jdk}-${browser}"] = {
-    retry(conditions: [agent(), nonresumable()], count: 2) {
-      node('docker-highmem') {
-        // Just to be safe
-        deleteDir()
-        checkout scm
-
-        withChecks(name: 'Tests', includeStage: true) {
-          infra.withArtifactCachingProxy {
-            sh "bash ath.sh ${jdk} ${browser}"
-          }
-          junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
-        }
-        /*
-         * Currently disabled, as the fact that this is a manually created subset will confuse Launchable,
-         * which expects this to be a full build. When we implement subsetting, this can be re-enabled using
-         * Launchable's subset rather than our own.
-         */
-        /*
-         withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
-         sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'"
-         }
-         */
-      }
-    }
-  }
-}
-
 builds.failFast = failFast
 parallel builds
 infra.maybePublishIncrementals()

cli/pom.xml

@@ -18,6 +18,8 @@
     <mina-sshd.version>2.19.0</mina-sshd.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
+    <!-- Intentionally run only one test to reduce cycle time -->
+    <test>QuotedStringTokenizerTest</test>
   </properties>
 
   <dependencyManagement>
@@ -53,7 +55,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
-      <version>1.84</version>
+      <version>1.85</version>
       <optional>true</optional>
     </dependency>
     <dependency>

core/pom.xml

@@ -43,6 +43,8 @@ THE SOFTWARE.
     <remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
+    <!-- Intentionally run only one test to reduce cycle time -->
+    <test>EnvVarsTest</test>
   </properties>
 
   <dependencyManagement>

core/src/main/java/hudson/PluginWrapper.java

@@ -522,6 +522,7 @@ public PluginWrapper(PluginManager parent, File archive, Manifest manifest, URL
         this.archive = archive;
     }
 
+    @Exported(visibility = 2)
     @Override
     public String getDisplayName() {
         String displayName = getLongName();
@@ -595,7 +596,7 @@ public List<Dependency> getOptionalDependencies() {
     /**
      * Returns the short name suitable for URL.
      */
-    @Exported
+    @Exported(visibility = 2)
     public String getShortName() {
         return shortName;
     }
@@ -627,7 +628,7 @@ public String getShortName() {
      *      null if this information is unavailable.
      * @since 1.283
      */
-    @Exported
+    @Exported(visibility = 2)
     public String getUrl() {
         // first look in update center metadata
         List<UpdateSite.Plugin> siteMetadataList = getInfoFromAllSites();
@@ -683,7 +684,7 @@ public YesNoMaybe supportsDynamicLoad() {
     /**
      * Returns the version number of this plugin
      */
-    @Exported
+    @Exported(visibility = 2)
     public String getVersion() {
         return getVersionOf(manifest);
     }
@@ -894,7 +895,7 @@ private Set<String> dependentsToCheck(PluginDisableStrategy strategy) {
     /**
      * Returns true if this plugin is enabled for this session.
      */
-    @Exported
+    @Exported(visibility = 2)
     public boolean isActive() {
         return active && !hasCycleDependency();
     }
@@ -921,7 +922,7 @@ public boolean isBundled() {
      * If true, the plugin is going to be activated next time
      * Jenkins runs.
      */
-    @Exported
+    @Exported(visibility = 2)
     public boolean isEnabled() {
         return !disableFile.exists();
     }
@@ -1080,7 +1081,7 @@ private List<UpdateSite.Plugin> getInfoFromAllSites() {
      * This method is conservative in the sense that if the version number is incomprehensible,
      * it always returns false.
      */
-    @Exported
+    @Exported(visibility = 2)
     public boolean hasUpdate() {
         return getUpdateInfo() != null;
     }

core/src/main/java/hudson/logging/LogRecorder.java

@@ -324,147 +324,213 @@
          * Makes sure that the logger passes through messages at the correct level to us.
          */
         public void enable() {
+            enableLogger();
+            new SetLevel(name, getLevel()).broadcast();
+        }
+
+        private void enableLogger() {
             Logger l = getLogger();
             if (!l.isLoggable(getLevel()))
                 l.setLevel(getLevel());
-            new SetLevel(name, getLevel()).broadcast();
         }
 
         public void disable() {
             getLogger().setLevel(null);
             new SetLevel(name, null).broadcast();
         }
 
     }
 
     private static class TargetComparator implements Comparator<Target>, Serializable {
 
         private static final long serialVersionUID = 9285340752515798L;
 
         @Override
         public int compare(Target left, Target right) {
             return right.getName().length() - left.getName().length();
         }
     }
 
     private static final class SetLevel extends MasterToSlaveCallable<Void, Error> {
         /** known loggers (kept per agent), to avoid GC */
         @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private static final Set<Logger> loggers = new HashSet<>();
         private final String name;
         private final Level level;
 
         SetLevel(String name, Level level) {
             this.name = name;
             this.level = level;
         }
 
         @Override public Void call() throws Error {
             Logger logger = Logger.getLogger(name);
             loggers.add(logger);
             logger.setLevel(level);
             return null;
         }
 
         void broadcast() {
             for (Computer c : Jenkins.get().getComputers()) {
                 if (!c.getName().isEmpty()) { // i.e. not master
                     VirtualChannel ch = c.getChannel();
                     if (ch != null) {
                         try {
                             ch.call(this);
                         } catch (Exception x) {
                             Logger.getLogger(LogRecorder.class.getName()).log(Level.WARNING, "could not set up logging on " + c, x);
                         }
                     }
                 }
             }
         }
     }
 
     @Extension @Restricted(NoExternalUse.class) public static final class ComputerLogInitializer extends ComputerListener {
         @Override public void preOnline(Computer c, Channel channel, FilePath root, TaskListener listener) throws IOException, InterruptedException {
             for (LogRecorder recorder : Jenkins.get().getLog().getRecorders()) {
                 for (Target t : recorder.getLoggers()) {
                     channel.call(new SetLevel(t.name, t.getLevel()));
                 }
             }
         }
     }
 
     @Override
     public String getDisplayName() {
         return name;
     }
 
     @Override
     public String getSearchUrl() {
         return Util.rawEncode(name);
     }
 
     public String getName() {
         return name;
     }
 
     public LogRecorderManager getParent() {
         return Jenkins.get().getLog();
     }
 
+    /**
+     * Updates controller logger levels after existing targets are reconfigured or removed. {@link Target#enable()}
+     * only makes a logger more verbose, so it cannot otherwise apply a change such as {@code FINEST} to {@code INFO}.
+     */
+    private void updateLogLevels(List<Target> previousTargets) {
+        List<LogRecorder> recorders = getParent().getRecorders();
+        Set<String> changedTargetNames = new LinkedHashSet<>();
+        for (Target previousTarget : previousTargets) {
+            Target target = getTarget(previousTarget.name, loggers);
+            if (target != null && target.getLevel().intValue() <= previousTarget.getLevel().intValue()) {
+                continue;
+            }
+            changedTargetNames.add(previousTarget.name);
+            if (sameLevel(previousTarget.getLogger().getLevel(), previousTarget.getLevel())) {
+                previousTarget.getLogger().setLevel(null);
+            }
+        }
+
+        for (LogRecorder recorder : recorders) {
+            for (Target target : recorder.loggers) {
+                if (changedTargetNames.contains(target.name)) {
+                    target.enableLogger();
+                }
+            }
+        }
+
+        List<Target> descendantTargets = new ArrayList<>();
+        for (LogRecorder recorder : recorders) {
+            for (Target target : recorder.loggers) {
+                if (changedTargetNames.stream().anyMatch(name -> isDescendant(name, target.name))) {
+                    descendantTargets.add(target);
+                }
+            }
+        }
+        descendantTargets.sort(Comparator.comparingInt(target -> target.name.length()));
+        descendantTargets.forEach(Target::enableLogger);
+    }
+
+    private static Target getTarget(String loggerName, List<Target> targets) {
+        return targets.stream().filter(target -> target.name.equals(loggerName)).findFirst().orElse(null);
+    }
+
+    private static boolean isDescendant(String loggerName, String candidate) {
+        return loggerName.isEmpty()
+                ? !candidate.isEmpty()
+                : candidate.startsWith(loggerName)
+                        && candidate.length() > loggerName.length()
+                        && candidate.charAt(loggerName.length()) == '.';
+    }
+
+    private static boolean sameLevel(Level first, Level second) {
+        return first == null ? second == null : second != null && first.intValue() == second.intValue();
+    }
+
     /**
      * Accepts submission from the configuration page.
      */
     @POST
     public synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         JSONObject src = req.getSubmittedForm();
 
         String newName = src.getString("name"), redirect = ".";
         XmlFile oldFile = null;
         if (!name.equals(newName)) {
             Jenkins.checkGoodName(newName);
             oldFile = getConfigFile();
             // rename
             List<LogRecorder> recorders = getParent().getRecorders();
             recorders.remove(new LogRecorder(name));
             this.name = newName;
             recorders.add(this);
             redirect = "../" + Util.rawEncode(newName) + '/';
         }
 
+        List<Target> previousTargets = List.copyOf(loggers);
         List<Target> newTargets = req.bindJSONToList(Target.class, src.get("loggers"));
         setLoggers(newTargets);
 
-        save();
+        save(previousTargets);
         if (oldFile != null) oldFile.delete();
         FormApply.success(redirect).generateResponse(req, rsp, null);
     }
 
     @RequirePOST
     public HttpResponse doClear() throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         handler.clear();
         return HttpResponses.redirectToDot();
     }
 
     /**
      * Loads the settings from a file.
      */
     @Override
     public synchronized void load() throws IOException {
         getConfigFile().unmarshal(this);
         loggers.forEach(Target::enable);
     }
 
     /**
      * Save the settings to a file.
      */
     @Override
     public synchronized void save() throws IOException {
+        save(null);
+    }
+
+    private synchronized void save(List<Target> previousTargets) throws IOException {
         if (BulkChange.contains(this))   return;
 
         getConfigFile().write(this);
         loggers.forEach(Target::enable);
+        if (previousTargets != null) {
+            updateLogLevels(previousTargets);
+        }
 
         SaveableListener.fireOnChange(this, getConfigFile());
     }

core/src/main/java/hudson/model/Cause.java

@@ -194,28 +194,23 @@
                 }
                 upstreamCauses.add(trim(c, MAX_DEPTH, traversed));
             }
-            fillCauseBag();
         }
 
         private UpstreamCause(String upstreamProject, int upstreamBuild, String upstreamUrl, @NonNull List<Cause> upstreamCauses) {
             this.upstreamProject = upstreamProject;
             this.upstreamBuild = upstreamBuild;
             this.upstreamUrl = upstreamUrl;
             this.upstreamCauses = upstreamCauses;
-            fillCauseBag();
         }
 
-        private void fillCauseBag() {
+        @Restricted(DoNotUse.class) // used from Jelly
+        public Map<Cause, Integer> getCauseCounts() {
             if (causeBag == null) {
                 causeBag = new LinkedHashMap<>();
+                for (Cause c : upstreamCauses) {
+                    causeBag.compute(c, (unused, cnt) -> cnt == null ? 1 : cnt + 1);
+                }
             }
-            for (Cause c : upstreamCauses) {
-                causeBag.compute(c, (unused, cnt) -> cnt == null ? 1 : cnt + 1);
-            }
-        }
-
-        @Restricted(DoNotUse.class) // used from Jelly
-        public Map<Cause, Integer> getCauseCounts() {
             return Collections.unmodifiableMap(causeBag);
         }
 
@@ -371,7 +366,6 @@
                     uc.upstreamCause = null;
                     OldDataMonitor.report(context, "1.288");
                 }
-                uc.fillCauseBag();
             }
         }
 

core/src/main/java/hudson/model/Job.java

@@ -110,6 +110,7 @@
 import jenkins.security.HexStringConfidentialKey;
 import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.triggers.SCMTriggerItem;
+import jenkins.util.SystemProperties;
 import jenkins.widgets.HasWidgets;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
@@ -1155,21 +1156,37 @@
             }
         }
 
+        // Default 20 entries (JENKINS-18992). Overridable via system property or ?max=
+        int maxEntries = SystemProperties.getInteger(Job.class.getName() + ".rssChangelogMaxEntries", 20);
+        String maxParam = req.getParameter("max");
+        if (maxParam != null) {
+            try {
+                maxEntries = Math.max(1, Integer.parseInt(maxParam));
+            } catch (NumberFormatException e) {
+                // keep default
+            }
+        }
+
         List<FeedItem> entries = new ArrayList<>();
         String scmDisplayName = "";
         if (this instanceof SCMTriggerItem scmItem) {
             List<String> scmNames = new ArrayList<>();
             for (SCM s : scmItem.getSCMs()) {
                 scmNames.add(s.getDescriptor().getDisplayName());
             }
             scmDisplayName = " " + String.join(", ", scmNames);
         }
 
+        // stop once we have enough; avoids loading every build for large jobs
+        outer:
         for (RunT r = getLastBuild(); r != null; r = r.getPreviousBuild()) {
             int idx = 0;
             if (r instanceof RunWithSCM) {
                 for (ChangeLogSet<? extends ChangeLogSet.Entry> c : ((RunWithSCM<?, ?>) r).getChangeSets()) {
                     for (ChangeLogSet.Entry e : c) {
+                        if (entries.size() >= maxEntries) {
+                            break outer;
+                        }
                         entries.add(new FeedItem(e, idx++));
                     }
                 }