From ehelin at openjdk.java.net Mon May 3 14:07:13 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 3 May 2021 14:07:13 GMT Subject: RFR: 1008: GitCombinedDiffParser does not handle un-modified copied files Message-ID: <1BUhdWd1vqsrmUIfblxIzNd93es30THivgYsSYsn-JM=.f28f0b24-b566-47bd-aea9-b56ce349be80@github.com> Hi all, please review this patch that makes the `GitCombinedDiffParser` handle not only renames with modifications (with regards to all parents), but also copies without modifications (with regards to all parents). Thanks, Erik ------------- Commit messages: - skara-1008 Changes: https://git.openjdk.java.net/skara/pull/1143/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1143&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1008 Stats: 6 lines in 1 file changed: 2 ins; 1 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1143.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1143/head:pull/1143 PR: https://git.openjdk.java.net/skara/pull/1143 From erikj at openjdk.java.net Mon May 3 16:27:51 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 3 May 2021 16:27:51 GMT Subject: RFR: 1008: GitCombinedDiffParser does not handle un-modified copied files In-Reply-To: <1BUhdWd1vqsrmUIfblxIzNd93es30THivgYsSYsn-JM=.f28f0b24-b566-47bd-aea9-b56ce349be80@github.com> References: <1BUhdWd1vqsrmUIfblxIzNd93es30THivgYsSYsn-JM=.f28f0b24-b566-47bd-aea9-b56ce349be80@github.com> Message-ID: On Mon, 3 May 2021 14:03:45 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the `GitCombinedDiffParser` handle not only renames with modifications (with regards to all parents), but also copies without modifications (with regards to all parents). > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1143 From ehelin at openjdk.java.net Mon May 3 16:34:34 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 3 May 2021 16:34:34 GMT Subject: Integrated: 1008: GitCombinedDiffParser does not handle un-modified copied files In-Reply-To: <1BUhdWd1vqsrmUIfblxIzNd93es30THivgYsSYsn-JM=.f28f0b24-b566-47bd-aea9-b56ce349be80@github.com> References: <1BUhdWd1vqsrmUIfblxIzNd93es30THivgYsSYsn-JM=.f28f0b24-b566-47bd-aea9-b56ce349be80@github.com> Message-ID: On Mon, 3 May 2021 14:03:45 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes the `GitCombinedDiffParser` handle not only renames with modifications (with regards to all parents), but also copies without modifications (with regards to all parents). > > Thanks, > Erik This pull request has now been integrated. Changeset: fb532a07 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fb532a0707ba9ac53cfcc9be0cf63399c0880740 Stats: 6 lines in 1 file changed: 2 ins; 1 del; 3 mod 1008: GitCombinedDiffParser does not handle un-modified copied files Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1143 From erikj at openjdk.java.net Mon May 3 19:35:24 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 3 May 2021 19:35:24 GMT Subject: RFR: 1011: Allow JDK fixVersion to be XXu-cpu Message-ID: We would like to be able to use fixVersions in JBS on the form "16u-cpu". This PR contains the necessary changes needed to the JdkVersion class to handle such versions. I'm also adding test cases to verify that it behaves as we want it. ------------- Commit messages: - SKARA-1011 Changes: https://git.openjdk.java.net/skara/pull/1144/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1144&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1011 Stats: 48 lines in 3 files changed: 46 ins; 2 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1144.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1144/head:pull/1144 PR: https://git.openjdk.java.net/skara/pull/1144 From ehelin at openjdk.java.net Tue May 4 08:09:24 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 4 May 2021 08:09:24 GMT Subject: RFR: 1011: Allow JDK fixVersion to be XXu-cpu In-Reply-To: References: Message-ID: On Mon, 3 May 2021 19:32:04 GMT, Erik Joelsson wrote: > We would like to be able to use fixVersions in JBS on the form "16u-cpu". This PR contains the necessary changes needed to the JdkVersion class to handle such versions. I'm also adding test cases to verify that it behaves as we want it. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1144 From kcr at openjdk.java.net Tue May 4 10:58:52 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 4 May 2021 10:58:52 GMT Subject: RFR: 1011: Allow JDK fixVersion to be XXu-cpu In-Reply-To: References: Message-ID: On Mon, 3 May 2021 19:32:04 GMT, Erik Joelsson wrote: > We would like to be able to use fixVersions in JBS on the form "16u-cpu". This PR contains the necessary changes needed to the JdkVersion class to handle such versions. I'm also adding test cases to verify that it behaves as we want it. Marked as reviewed by kcr (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1144 From ehelin at openjdk.java.net Tue May 4 11:42:18 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 4 May 2021 11:42:18 GMT Subject: [cr] RFR: 1006: The footer link of webrev.js is broken Message-ID: Hi all, please review this patch that fixes the link to `webrev.js` in the index view. Thanks, Erik ------------- Commit messages: - skara-1006 Changes: https://git.openjdk.java.net/cr/pull/15/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=15&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1006 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/cr/pull/15.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/15/head:pull/15 PR: https://git.openjdk.java.net/cr/pull/15 From ehelin at openjdk.java.net Tue May 4 12:13:01 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 4 May 2021 12:13:01 GMT Subject: RFR: forge: fix GitHubRepository.createPullRequestUrl Message-ID: Hi all, please review this patch that fixes `GitHubRepository.createPullRequestUrl` (I had forgotten a `/pull/`) in the URL. Thanks to @RealCLanger for finding this! Erik ------------- Commit messages: - forge: fix GitHubRepository.createPullRequestUrl Changes: https://git.openjdk.java.net/skara/pull/1145/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1145&range=00 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1145.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1145/head:pull/1145 PR: https://git.openjdk.java.net/skara/pull/1145 From clanger at openjdk.java.net Tue May 4 12:13:02 2021 From: clanger at openjdk.java.net (Christoph Langer) Date: Tue, 4 May 2021 12:13:02 GMT Subject: RFR: forge: fix GitHubRepository.createPullRequestUrl In-Reply-To: References: Message-ID: On Tue, 4 May 2021 12:07:52 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes `GitHubRepository.createPullRequestUrl` (I had forgotten a `/pull/`) in the URL. Thanks to @RealCLanger for finding this! > > Erik LGTM - as far as I can tell :) ------------- Marked as reviewed by clanger (no project role). PR: https://git.openjdk.java.net/skara/pull/1145 From erikj at openjdk.java.net Tue May 4 12:25:47 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 4 May 2021 12:25:47 GMT Subject: Integrated: 1011: Allow JDK fixVersion to be XXu-cpu In-Reply-To: References: Message-ID: On Mon, 3 May 2021 19:32:04 GMT, Erik Joelsson wrote: > We would like to be able to use fixVersions in JBS on the form "16u-cpu". This PR contains the necessary changes needed to the JdkVersion class to handle such versions. I'm also adding test cases to verify that it behaves as we want it. This pull request has now been integrated. Changeset: 26948592 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/26948592ebe1aa72e05bad599d93a6099a0a79e8 Stats: 48 lines in 3 files changed: 46 ins; 2 del; 0 mod 1011: Allow JDK fixVersion to be XXu-cpu Reviewed-by: ehelin, kcr ------------- PR: https://git.openjdk.java.net/skara/pull/1144 From erikj at openjdk.java.net Tue May 4 12:27:04 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 4 May 2021 12:27:04 GMT Subject: RFR: forge: fix GitHubRepository.createPullRequestUrl In-Reply-To: References: Message-ID: On Tue, 4 May 2021 12:07:52 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes `GitHubRepository.createPullRequestUrl` (I had forgotten a `/pull/`) in the URL. Thanks to @RealCLanger for finding this! > > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1145 From erikj at openjdk.java.net Tue May 4 12:39:49 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 4 May 2021 12:39:49 GMT Subject: [cr] RFR: 1006: The footer link of webrev.js is broken In-Reply-To: References: Message-ID: On Tue, 4 May 2021 11:38:48 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes the link to `webrev.js` in the index view. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/cr/pull/15 From ehelin at openjdk.java.net Tue May 4 12:51:28 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 4 May 2021 12:51:28 GMT Subject: Integrated: forge: fix GitHubRepository.createPullRequestUrl In-Reply-To: References: Message-ID: <7n1IMdHwj78pUR10Pxn9jx-Yla2O3pf2EzPYXHJ5oZQ=.9824f934-6877-472a-9305-21336872ac0a@github.com> On Tue, 4 May 2021 12:07:52 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes `GitHubRepository.createPullRequestUrl` (I had forgotten a `/pull/`) in the URL. Thanks to @RealCLanger for finding this! > > Erik This pull request has now been integrated. Changeset: 7f2c2e48 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/7f2c2e480386a06db8b3374128225b395560d531 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod forge: fix GitHubRepository.createPullRequestUrl Reviewed-by: clanger, erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1145 From aph at redhat.com Tue May 4 15:08:01 2021 From: aph at redhat.com (Andrew Haley) Date: Tue, 4 May 2021 16:08:01 +0100 Subject: Weird build failure on MacOS/Big Sur/AArch64 Message-ID: aph at laxton ~ % git token store https://github.com Compiling ... > Task :cli:linkLocal Shared spaces are not supported in this VM Error: Could not create the Java Virtual Machine. Error: A fatal exception has occurred. Program will exit. > Task :cli:linkLocal FAILED FAILURE: Build failed with an exception. * What went wrong: Execution failed for task ':cli:linkLocal'. > Process 'command '/Users/aph/skara/cli/build/images/local/bin/java'' finished with non-zero exit value 1 Any ideas? Thanks, -- Andrew Haley (he/him) Java Platform Lead Engineer Red Hat UK Ltd. https://keybase.io/andrewhaley EAC8 43EB D3EF DB98 CC77 2FAD A5CD 6035 332F A671 From erik.joelsson at oracle.com Tue May 4 16:33:51 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Tue, 4 May 2021 09:33:51 -0700 Subject: Weird build failure on MacOS/Big Sur/AArch64 In-Reply-To: References: Message-ID: <54796f3b-cbcc-29ca-ecf0-f7f32e09f9da@oracle.com> Hello Andrew, I think you are first in trying this on MacOS AArch64. I don't currently have access to such a machine to try it. Most likely it's something simple with the logic for picking the JDK to download for running the build. /Erik On 2021-05-04 08:08, Andrew Haley wrote: > aph at laxton ~ % git token store https://github.com > Compiling ... > >> Task :cli:linkLocal > Shared spaces are not supported in this VM > Error: Could not create the Java Virtual Machine. > Error: A fatal exception has occurred. Program will exit. > >> Task :cli:linkLocal FAILED > FAILURE: Build failed with an exception. > > * What went wrong: > Execution failed for task ':cli:linkLocal'. >> Process 'command '/Users/aph/skara/cli/build/images/local/bin/java'' finished with non-zero exit value 1 > Any ideas? > > Thanks, > From david.holmes at oracle.com Wed May 5 01:44:48 2021 From: david.holmes at oracle.com (David Holmes) Date: Wed, 5 May 2021 11:44:48 +1000 Subject: Weird build failure on MacOS/Big Sur/AArch64 In-Reply-To: <54796f3b-cbcc-29ca-ecf0-f7f32e09f9da@oracle.com> References: <54796f3b-cbcc-29ca-ecf0-f7f32e09f9da@oracle.com> Message-ID: On 5/05/2021 2:33 am, erik.joelsson at oracle.com wrote: > Hello Andrew, > > I think you are first in trying this on MacOS AArch64. I don't currently > have access to such a machine to try it. Most likely it's something > simple with the logic for picking the JDK to download for running the > build. Build instructions assume CDS is always available? ./plugins/skara-images/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java project.exec((spec) -> { spec.setCommandLine(java, "-Xshare:dump", "-version"); }); but no guarantee a JDK has CDS enabled. Also seems wrong to assume that you should create a new CDS archive for the JDK being used even if CDS is enabled. Cheers, David > /Erik > > On 2021-05-04 08:08, Andrew Haley wrote: >> aph at laxton ~ % git token store https://github.com >> Compiling ... >> >>> Task :cli:linkLocal >> Shared spaces are not supported in this VM >> Error: Could not create the Java Virtual Machine. >> Error: A fatal exception has occurred. Program will exit. >> >>> Task :cli:linkLocal FAILED >> FAILURE: Build failed with an exception. >> >> * What went wrong: >> Execution failed for task ':cli:linkLocal'. >>> Process 'command '/Users/aph/skara/cli/build/images/local/bin/java'' >>> finished with non-zero exit value 1 >> Any ideas? >> >> Thanks, >> From ehelin at openjdk.java.net Wed May 5 07:39:01 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 5 May 2021 07:39:01 GMT Subject: [cr] Integrated: 1006: The footer link of webrev.js is broken In-Reply-To: References: Message-ID: On Tue, 4 May 2021 11:38:48 GMT, Erik Helin wrote: > Hi all, > > please review this patch that fixes the link to `webrev.js` in the index view. > > Thanks, > Erik This pull request has now been integrated. Changeset: 6182f805 Author: Erik Helin URL: https://git.openjdk.java.net/cr/commit/6182f805a784580ee3ec99e86e9ab68d5eb539f6 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod 1006: The footer link of webrev.js is broken Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/cr/pull/15 From aph at redhat.com Wed May 5 10:28:50 2021 From: aph at redhat.com (Andrew Haley) Date: Wed, 5 May 2021 11:28:50 +0100 Subject: Weird build failure on MacOS/Big Sur/AArch64 In-Reply-To: References: <54796f3b-cbcc-29ca-ecf0-f7f32e09f9da@oracle.com> Message-ID: <743ff0fb-aa64-1640-f317-e4adf2e27dcb@redhat.com> On 5/5/21 2:44 AM, David Holmes wrote: > On 5/05/2021 2:33 am, erik.joelsson at oracle.com wrote: >> Hello Andrew, >> >> I think you are first in trying this on MacOS AArch64. I don't currently >> have access to such a machine to try it. Most likely it's something >> simple with the logic for picking the JDK to download for running the >> build. > > Build instructions assume CDS is always available? > > > ./plugins/skara-images/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java > > project.exec((spec) -> { > spec.setCommandLine(java, "-Xshare:dump", "-version"); > }); > > but no guarantee a JDK has CDS enabled. Also seems wrong to assume that > you should create a new CDS archive for the JDK being used even if CDS > is enabled. Yay! Removing that line was all I needed. BUILD SUCCESSFUL in 14s 45 actionable tasks: 24 executed, 21 up-to-date info: if you are prompted for a password, fill in your personal access token, *not* your login password for https://github.com Username for 'https://github.com': theRealAph Password for 'https://theRealAph at github.com': -- Andrew Haley (he/him) Java Platform Lead Engineer Red Hat UK Ltd. https://keybase.io/andrewhaley EAC8 43EB D3EF DB98 CC77 2FAD A5CD 6035 332F A671 From erikj at openjdk.java.net Wed May 5 21:09:09 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 5 May 2021 21:09:09 GMT Subject: RFR: 1012: Lots of "unhealthy" jdk repos found in scratch dirs Message-ID: Add --dissociate when cloning a repo using a seed. It's simply not safe to share objects between repos when we remove objects in the seed repo (which happens automatically behind the scenes when git GCs). This is documented in the git-clone man page. Changing this will increase disk usage some, but that's something we just have to live with. ------------- Commit messages: - SKARA-1012 Changes: https://git.openjdk.java.net/skara/pull/1146/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1146&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1012 Stats: 4 lines in 2 files changed: 3 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1146.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1146/head:pull/1146 PR: https://git.openjdk.java.net/skara/pull/1146 From erikj at openjdk.java.net Wed May 5 21:09:10 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 5 May 2021 21:09:10 GMT Subject: RFR: 1012: Lots of "unhealthy" jdk repos found in scratch dirs In-Reply-To: References: Message-ID: On Wed, 5 May 2021 21:05:47 GMT, Erik Joelsson wrote: > Add --dissociate when cloning a repo using a seed. It's simply not safe to share objects between repos when we remove objects in the seed repo (which happens automatically behind the scenes when git GCs). This is documented in the git-clone man page. Changing this will increase disk usage some, but that's something we just have to live with. forge/src/main/java/org/openjdk/skara/forge/HostedRepositoryPool.java line 120: > 118: private void removeOldClone(Path path, String reason) { > 119: if (Files.exists(path)) { > 120: var preserved = path.resolveSibling(path.getFileName().toString() + "-" + reason + "-" + UUID.randomUUID()); The filename here was based on the seed repo (which usually has a .git suffix) instead of the scratch repo that we are copying. That didn't really make sense. ------------- PR: https://git.openjdk.java.net/skara/pull/1146 From tbell at openjdk.java.net Thu May 6 04:12:46 2021 From: tbell at openjdk.java.net (Tim Bell) Date: Thu, 6 May 2021 04:12:46 GMT Subject: RFR: 1012: Lots of "unhealthy" jdk repos found in scratch dirs In-Reply-To: References: Message-ID: On Wed, 5 May 2021 21:05:47 GMT, Erik Joelsson wrote: > Add --dissociate when cloning a repo using a seed. It's simply not safe to share objects between repos when we remove objects in the seed repo (which happens automatically behind the scenes when git GCs). This is documented in the git-clone man page. Changing this will increase disk usage some, but that's something we just have to live with. Very subtle. Looks good. ------------- Marked as reviewed by tbell (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1146 From erikj at openjdk.java.net Thu May 6 13:16:29 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 6 May 2021 13:16:29 GMT Subject: Integrated: 1012: Lots of "unhealthy" jdk repos found in scratch dirs In-Reply-To: References: Message-ID: On Wed, 5 May 2021 21:05:47 GMT, Erik Joelsson wrote: > Add --dissociate when cloning a repo using a seed. It's simply not safe to share objects between repos when we remove objects in the seed repo (which happens automatically behind the scenes when git GCs). This is documented in the git-clone man page. Changing this will increase disk usage some, but that's something we just have to live with. This pull request has now been integrated. Changeset: 58e1d724 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/58e1d72477442081a9406d515af04f75fa6072a2 Stats: 4 lines in 2 files changed: 3 ins; 0 del; 1 mod 1012: Lots of "unhealthy" jdk repos found in scratch dirs Reviewed-by: tbell ------------- PR: https://git.openjdk.java.net/skara/pull/1146 From erik.joelsson at oracle.com Thu May 6 22:42:02 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Thu, 6 May 2021 15:42:02 -0700 Subject: Result: New Skara Reviewer: Magnus Ihse Bursie In-Reply-To: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> References: <67de1937-7754-f9db-42df-c45b84bc9d99@oracle.com> Message-ID: <3dbbffb3-37ae-ea66-20b4-55eef833cd02@oracle.com> Voting for Magnus Ihse Bursie [1] is now closed. Yes: 4 Veto: 0 Abstain: 0 According to the Bylaws definition of Three-Vote Consensus, this is sufficient to approve the nomination. Erik Joelsson [1] https://mail.openjdk.java.net/pipermail/skara-dev/2021-April/004760.html From erik.joelsson at oracle.com Thu May 6 22:43:54 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Thu, 6 May 2021 15:43:54 -0700 Subject: Result: New Skara Committer: Kevin Rushforth Message-ID: <942cdb10-ded6-b133-f78c-fd9c0710d2f0@oracle.com> Voting for Kevin Rushforth [1] is now closed. Yes: 4 Veto: 0 Abstain: 0 According to the Bylaws definition of Lazy Consensus, this is sufficient to approve the nomination. Erik Joelsson [1] https://mail.openjdk.java.net/pipermail/skara-dev/2021-April/004766.html From erikj at openjdk.java.net Thu May 6 23:49:46 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 6 May 2021 23:49:46 GMT Subject: RFR: 1019: IssueNotifier fails if there are extra branches in a repo Message-ID: <_i2DP87HbotpjS6n7YA0WduPbc5bhGDsSODpv6s_GJ0=.a3e7012e-1c9d-4578-9ffa-c5cadff40537@github.com> This change makes the notifier bot more lenient when finding branches without fixVersions configured, or when those fixVersions do not have backports in the issue tracker, when processing new tags. Currently either of these cases will cause the rest of the commits affected by a tag to never get processed. See bug for more details. ------------- Commit messages: - SKARA-1019 Changes: https://git.openjdk.java.net/skara/pull/1147/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1147&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1019 Stats: 8 lines in 2 files changed: 5 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1147.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1147/head:pull/1147 PR: https://git.openjdk.java.net/skara/pull/1147 From kcr at openjdk.java.net Fri May 7 00:08:57 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 7 May 2021 00:08:57 GMT Subject: RFR: 1019: IssueNotifier fails if there are extra branches in a repo In-Reply-To: <_i2DP87HbotpjS6n7YA0WduPbc5bhGDsSODpv6s_GJ0=.a3e7012e-1c9d-4578-9ffa-c5cadff40537@github.com> References: <_i2DP87HbotpjS6n7YA0WduPbc5bhGDsSODpv6s_GJ0=.a3e7012e-1c9d-4578-9ffa-c5cadff40537@github.com> Message-ID: On Thu, 6 May 2021 23:46:00 GMT, Erik Joelsson wrote: > This change makes the notifier bot more lenient when finding branches without fixVersions configured, or when those fixVersions do not have backports in the issue tracker, when processing new tags. Currently either of these cases will cause the rest of the commits affected by a tag to never get processed. See bug for more details. lgtm ------------- Marked as reviewed by kcr (no project role). PR: https://git.openjdk.java.net/skara/pull/1147 From ehelin at openjdk.java.net Fri May 7 08:01:17 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 7 May 2021 08:01:17 GMT Subject: RFR: 1019: IssueNotifier fails if there are extra branches in a repo In-Reply-To: <_i2DP87HbotpjS6n7YA0WduPbc5bhGDsSODpv6s_GJ0=.a3e7012e-1c9d-4578-9ffa-c5cadff40537@github.com> References: <_i2DP87HbotpjS6n7YA0WduPbc5bhGDsSODpv6s_GJ0=.a3e7012e-1c9d-4578-9ffa-c5cadff40537@github.com> Message-ID: <4LabOFTJAZ_IzXQJPaj19lXYMN0a_kiDoCZfn2g3lqQ=.0ca91985-28fc-478b-9ae3-b0539459aafa@github.com> On Thu, 6 May 2021 23:46:00 GMT, Erik Joelsson wrote: > This change makes the notifier bot more lenient when finding branches without fixVersions configured, or when those fixVersions do not have backports in the issue tracker, when processing new tags. Currently either of these cases will cause the rest of the commits affected by a tag to never get processed. See bug for more details. Looks good! This is definitely a reasonable approach. An alternative approach if you want to be a bit more safe would be to configure some branches with an ignore value. That way the notifier will know if a branch is supposed to e.g. have a `fixVersion` or not. That way we will still get the exceptions for cases when a branch does not have a configured `fixVersion` nor is configured to be ignored. ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1147 From erikj at openjdk.java.net Fri May 7 12:56:17 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 7 May 2021 12:56:17 GMT Subject: Integrated: 1019: IssueNotifier fails if there are extra branches in a repo In-Reply-To: <_i2DP87HbotpjS6n7YA0WduPbc5bhGDsSODpv6s_GJ0=.a3e7012e-1c9d-4578-9ffa-c5cadff40537@github.com> References: <_i2DP87HbotpjS6n7YA0WduPbc5bhGDsSODpv6s_GJ0=.a3e7012e-1c9d-4578-9ffa-c5cadff40537@github.com> Message-ID: On Thu, 6 May 2021 23:46:00 GMT, Erik Joelsson wrote: > This change makes the notifier bot more lenient when finding branches without fixVersions configured, or when those fixVersions do not have backports in the issue tracker, when processing new tags. Currently either of these cases will cause the rest of the commits affected by a tag to never get processed. See bug for more details. This pull request has now been integrated. Changeset: 3ec08934 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/3ec08934850a8c0f5616a0f7d2ba2f6eb5d05db0 Stats: 8 lines in 2 files changed: 5 ins; 0 del; 3 mod 1019: IssueNotifier fails if there are extra branches in a repo Reviewed-by: kcr, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1147 From lgxbslgx at gmail.com Mon May 10 07:03:57 2021 From: lgxbslgx at gmail.com (Guoxiong Li) Date: Mon, 10 May 2021 15:03:57 +0800 Subject: github PR fails to send RFR email In-Reply-To: <56D59455-8461-4823-B690-B5D92D868314@tencent.com> References: <56D59455-8461-4823-B690-B5D92D868314@tencent.com> Message-ID: Hi jie, The same problem occurred in my PR[1]. And this problem began yesterday and only affects newly issued PRs(about 5 PRs now). Similar problems have occurred in the past(also on *weekends*). The maintainers may fix it quickly during working time. CC'ing skara-dev at openjdk.java.net [1] https://github.com/openjdk/jdk/pull/3942 Best Regards, -- Guoxiong On Mon, May 10, 2021 at 2:24 PM jiefu(??) wrote: > Hi all, > > > > I found my PR [1] fails to send RFR email. > > > > Is there anything wrong? > > Or am I missing something? > > > > Thanks. > > Best regards, > > Jie > > > > [1] https://github.com/openjdk/jdk/pull/3941 > > From erik.joelsson at oracle.com Mon May 10 13:37:28 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Mon, 10 May 2021 06:37:28 -0700 Subject: github PR fails to send RFR email In-Reply-To: References: <56D59455-8461-4823-B690-B5D92D868314@tencent.com> Message-ID: <313127c0-3560-ae4e-c2a5-b768c8b5c508@oracle.com> (removing build-dev as this is not a build issue) Hello, There was an issue with a stuck Skara bot over the weekend. It has been restarted and things are moving along again. I have filed SKARA-1022 and SKARA-1023 to try to eliminate this particular problem in the future. /Erik On 2021-05-10 00:03, Guoxiong Li wrote: > Hi jie, > > The same problem occurred in my PR[1]. > And this problem began yesterday and only affects newly issued PRs(about 5 > PRs now). > > Similar problems have occurred in the past(also on *weekends*). > The maintainers may fix it quickly during working time. > > CC'ing skara-dev at openjdk.java.net > > [1] https://github.com/openjdk/jdk/pull/3942 > > > Best Regards, > -- Guoxiong > > > On Mon, May 10, 2021 at 2:24 PM jiefu(??) wrote: > >> Hi all, >> >> >> >> I found my PR [1] fails to send RFR email. >> >> >> >> Is there anything wrong? >> >> Or am I missing something? >> >> >> >> Thanks. >> >> Best regards, >> >> Jie >> >> >> >> [1] https://github.com/openjdk/jdk/pull/3941 >> >> From jiefu at tencent.com Mon May 10 23:50:28 2021 From: jiefu at tencent.com (=?utf-8?B?amllZnUo5YKF5p2wKQ==?=) Date: Mon, 10 May 2021 23:50:28 +0000 Subject: github PR fails to send RFR email(Internet mail) In-Reply-To: <313127c0-3560-ae4e-c2a5-b768c8b5c508@oracle.com> References: <56D59455-8461-4823-B690-B5D92D868314@tencent.com> <313127c0-3560-ae4e-c2a5-b768c8b5c508@oracle.com> Message-ID: <6DB82FFE-43A9-47EF-B224-A08F5B840F0A@tencent.com> Thanks Erik. Best regards, Jie ?On 2021/5/10, 9:38 PM, "erik.joelsson at oracle.com" wrote: (removing build-dev as this is not a build issue) Hello, There was an issue with a stuck Skara bot over the weekend. It has been restarted and things are moving along again. I have filed SKARA-1022 and SKARA-1023 to try to eliminate this particular problem in the future. /Erik On 2021-05-10 00:03, Guoxiong Li wrote: > Hi jie, > > The same problem occurred in my PR[1]. > And this problem began yesterday and only affects newly issued PRs(about 5 > PRs now). > > Similar problems have occurred in the past(also on *weekends*). > The maintainers may fix it quickly during working time. > > CC'ing skara-dev at openjdk.java.net > > [1] https://github.com/openjdk/jdk/pull/3942 > > > Best Regards, > -- Guoxiong > > > On Mon, May 10, 2021 at 2:24 PM jiefu(??) wrote: > >> Hi all, >> >> >> >> I found my PR [1] fails to send RFR email. >> >> >> >> Is there anything wrong? >> >> Or am I missing something? >> >> >> >> Thanks. >> >> Best regards, >> >> Jie >> >> >> >> [1] https://github.com/openjdk/jdk/pull/3941 >> >> From lgxbslgx at gmail.com Tue May 11 01:25:47 2021 From: lgxbslgx at gmail.com (Guoxiong Li) Date: Tue, 11 May 2021 09:25:47 +0800 Subject: github PR fails to send RFR email In-Reply-To: <313127c0-3560-ae4e-c2a5-b768c8b5c508@oracle.com> References: <56D59455-8461-4823-B690-B5D92D868314@tencent.com> <313127c0-3560-ae4e-c2a5-b768c8b5c508@oracle.com> Message-ID: Hi Erik, Thank you for your reply. I read the SKARA-1022 and don't have permission to read SKARA-1023. To solve the OOME, restarting may be a temperate useful way. What we should pay more attention to is that the source code may have a `memory leak` issue which needs to be fixed. Best Regards, -- Guoxiong On Mon, May 10, 2021 at 9:37 PM wrote: > (removing build-dev as this is not a build issue) > > Hello, > > There was an issue with a stuck Skara bot over the weekend. It has been > restarted and things are moving along again. I have filed SKARA-1022 and > SKARA-1023 to try to eliminate this particular problem in the future. > > /Erik > > On 2021-05-10 00:03, Guoxiong Li wrote: > > Hi jie, > > > > The same problem occurred in my PR[1]. > > And this problem began yesterday and only affects newly issued PRs(about > 5 > > PRs now). > > > > Similar problems have occurred in the past(also on *weekends*). > > The maintainers may fix it quickly during working time. > > > > CC'ing skara-dev at openjdk.java.net > > > > [1] https://github.com/openjdk/jdk/pull/3942 > > > > > > Best Regards, > > -- Guoxiong > > > > > > On Mon, May 10, 2021 at 2:24 PM jiefu(??) wrote: > > > >> Hi all, > >> > >> > >> > >> I found my PR [1] fails to send RFR email. > >> > >> > >> > >> Is there anything wrong? > >> > >> Or am I missing something? > >> > >> > >> > >> Thanks. > >> > >> Best regards, > >> > >> Jie > >> > >> > >> > >> [1] https://github.com/openjdk/jdk/pull/3941 > >> > >> > From erik.joelsson at oracle.com Tue May 11 12:28:35 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Tue, 11 May 2021 05:28:35 -0700 Subject: [External] : Re: github PR fails to send RFR email In-Reply-To: References: <56D59455-8461-4823-B690-B5D92D868314@tencent.com> <313127c0-3560-ae4e-c2a5-b768c8b5c508@oracle.com> Message-ID: On 2021-05-10 18:25, Guoxiong Li wrote: > Hi Erik, > > Thank you for your reply. > I read the SKARA-1022 and don't have permission to read SKARA-1023. > To solve the OOME, restarting may be a temperate useful way. > What we should pay more attention to is?that the source code may have > a `memory leak` issue which needs to be fixed. > SKARA-1023 is about the memory leak, but as that particular bot is not open source, I had to file the issue as confidential. I forgot about this when mentioning the issues. /Erik > Best Regards, > -- Guoxiong > > > On Mon, May 10, 2021 at 9:37 PM > wrote: > > (removing build-dev as this is not a build issue) > > Hello, > > There was an issue with a stuck Skara bot over the weekend. It has > been > restarted and things are moving along again. I have filed > SKARA-1022 and > SKARA-1023 to try to eliminate this particular problem in the future. > > /Erik > > On 2021-05-10 00:03, Guoxiong Li wrote: > > Hi jie, > > > > The same problem occurred in my PR[1]. > > And this problem began yesterday and only affects newly issued > PRs(about 5 > > PRs now). > > > > Similar problems have occurred in the past(also on *weekends*). > > The maintainers may fix it quickly during working time. > > > > CC'ing skara-dev at openjdk.java.net > > > > > [1] https://github.com/openjdk/jdk/pull/3942 > > > > > > > Best Regards, > > -- Guoxiong > > > > > > On Mon, May 10, 2021 at 2:24 PM jiefu(??) > wrote: > > > >> Hi all, > >> > >> > >> > >> I found my PR [1] fails to send RFR email. > >> > >> > >> > >> Is there anything wrong? > >> > >> Or am I missing something? > >> > >> > >> > >> Thanks. > >> > >> Best regards, > >> > >> Jie > >> > >> > >> > >> [1] https://github.com/openjdk/jdk/pull/3941 > > >> > >> > From lgxbslgx at gmail.com Tue May 11 13:03:06 2021 From: lgxbslgx at gmail.com (Guoxiong Li) Date: Tue, 11 May 2021 21:03:06 +0800 Subject: [External] : Re: github PR fails to send RFR email In-Reply-To: References: <56D59455-8461-4823-B690-B5D92D868314@tencent.com> <313127c0-3560-ae4e-c2a5-b768c8b5c508@oracle.com> Message-ID: Got it. Thanks for your reply. Best Regards, -- Guoxiong On Tue, May 11, 2021 at 8:28 PM wrote: > On 2021-05-10 18:25, Guoxiong Li wrote: > > Hi Erik, > > Thank you for your reply. > I read the SKARA-1022 and don't have permission to read SKARA-1023. > To solve the OOME, restarting may be a temperate useful way. > What we should pay more attention to is that the source code may have a > `memory leak` issue which needs to be fixed. > > SKARA-1023 is about the memory leak, but as that particular bot is not > open source, I had to file the issue as confidential. I forgot about this > when mentioning the issues. > /Erik > From ehelin at openjdk.java.net Tue May 11 18:35:47 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 11 May 2021 18:35:47 GMT Subject: RFR: metrics: add library Message-ID: Hi all, please review this patch that adds the new `metrics` library. The metrics library can be used to collect runtime metrics, such as the number of HTTP requests or the number of bot runs. The library is designed according to the [Prometheus library guide](https://prometheus.io/docs/instrumenting/writing_clientlibs/) and currently features the two Prometheus types [gauge](https://prometheus.io/docs/concepts/metric_types/#gauge) and [counter](https://prometheus.io/docs/concepts/metric_types/#counter). The library is designed to allow it to be extended with the [histogram](https://prometheus.io/docs/concepts/metric_types/#histogram) and [summary](https://prometheus.io/docs/concepts/metric_types/#summary) types if we find a need for them. The `Counter` and `Gauge` types are designed to be thread-safe and should typically be stored in a `private final static` variable in a classes (similar to how one might store a `Logger` instance). A minimal `Counter` example looks like: class Example { private static final Counter counter = Counter.name("test").register(); } I won't go into details here on how Prometheus naming and labelling works, please see the Prometheus [documentation](https://prometheus.io/docs/introduction/overview/) for those concepts. The goal is that library should be fairly self-explanatory for someone with an understanding of how Prometheus works. Note though that the `metrics` library itself is not tied to Prometheus in any way, it only supports the collection of runtime metrics. It is however designed to make it easy to write a Prometheus exporter, something I will show in a follow-up patch. I also added a bunch of unit tests for the new library. Thanks, Erik ------------- Commit messages: - metrics: add library Changes: https://git.openjdk.java.net/skara/pull/1148/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1148&range=00 Stats: 1234 lines in 34 files changed: 1228 ins; 1 del; 5 mod Patch: https://git.openjdk.java.net/skara/pull/1148.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1148/head:pull/1148 PR: https://git.openjdk.java.net/skara/pull/1148 From erikj at openjdk.java.net Tue May 11 21:07:38 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 11 May 2021 21:07:38 GMT Subject: RFR: metrics: add library In-Reply-To: References: Message-ID: On Tue, 11 May 2021 18:32:17 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the new `metrics` library. The metrics library can be used to collect runtime metrics, such as the number of HTTP requests or the number of bot runs. The library is designed according to the [Prometheus library guide](https://prometheus.io/docs/instrumenting/writing_clientlibs/) and currently features the two Prometheus types [gauge](https://prometheus.io/docs/concepts/metric_types/#gauge) and [counter](https://prometheus.io/docs/concepts/metric_types/#counter). The library is designed to allow it to be extended with the [histogram](https://prometheus.io/docs/concepts/metric_types/#histogram) and [summary](https://prometheus.io/docs/concepts/metric_types/#summary) types if we find a need for them. > > The `Counter` and `Gauge` types are designed to be thread-safe and should typically be stored in a `private final static` variable in a classes (similar to how one might store a `Logger` instance). A minimal `Counter` example looks like: > > > class Example { > private static final Counter counter = Counter.name("test").register(); > } > > > I won't go into details here on how Prometheus naming and labelling works, please see the Prometheus [documentation](https://prometheus.io/docs/introduction/overview/) for those concepts. The goal is that library should be fairly self-explanatory for someone with an understanding of how Prometheus works. Note though that the `metrics` library itself is not tied to Prometheus in any way, it only supports the collection of runtime metrics. It is however designed to make it easy to write a Prometheus exporter, something I will show in a follow-up patch. > > I also added a bunch of unit tests for the new library. > > Thanks, > Erik Looks good, thanks for implementing this! metrics/src/main/java/org/openjdk/skara/metrics/Counter.java line 185: > 183: this.name = name; > 184: this.label = label; > 185: this.value = new ConcurrentHashMap(); Can leave out the types between <> here. metrics/src/main/java/org/openjdk/skara/metrics/Gauge.java line 213: > 211: this.name = name; > 212: this.label = label; > 213: this.value = new ConcurrentHashMap(); And here. ------------- Marked as reviewed by erikj (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1148 From ehelin at openjdk.java.net Wed May 12 07:03:29 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 07:03:29 GMT Subject: RFR: metrics: add library [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds the new `metrics` library. The metrics library can be used to collect runtime metrics, such as the number of HTTP requests or the number of bot runs. The library is designed according to the [Prometheus library guide](https://prometheus.io/docs/instrumenting/writing_clientlibs/) and currently features the two Prometheus types [gauge](https://prometheus.io/docs/concepts/metric_types/#gauge) and [counter](https://prometheus.io/docs/concepts/metric_types/#counter). The library is designed to allow it to be extended with the [histogram](https://prometheus.io/docs/concepts/metric_types/#histogram) and [summary](https://prometheus.io/docs/concepts/metric_types/#summary) types if we find a need for them. > > The `Counter` and `Gauge` types are designed to be thread-safe and should typically be stored in a `private final static` variable in a classes (similar to how one might store a `Logger` instance). A minimal `Counter` example looks like: > > > class Example { > private static final Counter counter = Counter.name("test").register(); > } > > > I won't go into details here on how Prometheus naming and labelling works, please see the Prometheus [documentation](https://prometheus.io/docs/introduction/overview/) for those concepts. The goal is that library should be fairly self-explanatory for someone with an understanding of how Prometheus works. Note though that the `metrics` library itself is not tied to Prometheus in any way, it only supports the collection of runtime metrics. It is however designed to make it easy to write a Prometheus exporter, something I will show in a follow-up patch. > > I also added a bunch of unit tests for the new library. > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Reviewer feedback ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1148/files - new: https://git.openjdk.java.net/skara/pull/1148/files/38e0ee00..35bb1235 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1148&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1148&range=00-01 Stats: 2 lines in 2 files changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1148.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1148/head:pull/1148 PR: https://git.openjdk.java.net/skara/pull/1148 From ehelin at openjdk.java.net Wed May 12 07:03:30 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 07:03:30 GMT Subject: RFR: metrics: add library [v2] In-Reply-To: References: Message-ID: On Tue, 11 May 2021 21:05:21 GMT, Erik Joelsson wrote: >> Erik Helin has updated the pull request incrementally with one additional commit since the last revision: >> >> Reviewer feedback > > Looks good, thanks for implementing this! Thanks @erikj79 for reviewing! ------------- PR: https://git.openjdk.java.net/skara/pull/1148 From ehelin at openjdk.java.net Wed May 12 07:03:30 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 07:03:30 GMT Subject: Integrated: metrics: add library In-Reply-To: References: Message-ID: On Tue, 11 May 2021 18:32:17 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the new `metrics` library. The metrics library can be used to collect runtime metrics, such as the number of HTTP requests or the number of bot runs. The library is designed according to the [Prometheus library guide](https://prometheus.io/docs/instrumenting/writing_clientlibs/) and currently features the two Prometheus types [gauge](https://prometheus.io/docs/concepts/metric_types/#gauge) and [counter](https://prometheus.io/docs/concepts/metric_types/#counter). The library is designed to allow it to be extended with the [histogram](https://prometheus.io/docs/concepts/metric_types/#histogram) and [summary](https://prometheus.io/docs/concepts/metric_types/#summary) types if we find a need for them. > > The `Counter` and `Gauge` types are designed to be thread-safe and should typically be stored in a `private final static` variable in a classes (similar to how one might store a `Logger` instance). A minimal `Counter` example looks like: > > > class Example { > private static final Counter counter = Counter.name("test").register(); > } > > > I won't go into details here on how Prometheus naming and labelling works, please see the Prometheus [documentation](https://prometheus.io/docs/introduction/overview/) for those concepts. The goal is that library should be fairly self-explanatory for someone with an understanding of how Prometheus works. Note though that the `metrics` library itself is not tied to Prometheus in any way, it only supports the collection of runtime metrics. It is however designed to make it easy to write a Prometheus exporter, something I will show in a follow-up patch. > > I also added a bunch of unit tests for the new library. > > Thanks, > Erik This pull request has now been integrated. Changeset: 537acafc Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/537acafcd3cfd453b909edea154fe283d8d5e628 Stats: 1234 lines in 34 files changed: 1228 ins; 1 del; 5 mod metrics: add library Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1148 From ehelin at openjdk.java.net Wed May 12 07:28:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 07:28:27 GMT Subject: RFR: bot: modularize HTTP server Message-ID: Hi all, please review this patch that modularizes the bot HTTP server. The HTTP server featured by the bot runner is currently only used to process webhooks, but I have coming patches that extends it with other functionality. This refactoring make the bot runner start the actual server and then handlers can be configured in a configuration file. A minimal configuration file looks like: { "scratch": { "path": "/tmp/skara/scratch" }, "storage": { "path": "/tmp/skara/storage" }, "runner": { "interval": "PT10S", "watchdog": "PT30M", "concurrency": 2 }, "log": { "console": { "level": "FINER" } }, "http-server": { "port": 8080, "/api": { "type": "webhook" } } } Using the above configuration stored in `config.json` the bot runner can then be started as: $ make bots $ ./bots/bin/bin/skara-bots $PWD/config.json The HTTP server can be then be queried using e.g. `curl`: $ curl --verbose --request POST --data '{"foo": "bar"}' http://localhost:8080/api Note: Unnecessary use of -X or --request, POST is already inferred. % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0* Trying 127.0.0.1:8080... * TCP_NODELAY set * Connected to localhost (127.0.0.1) port 8080 (#0) > POST /api HTTP/1.1 > Host: localhost:8080 > User-Agent: curl/7.68.0 > Accept: */* > Content-Length: 14 > Content-Type: application/x-www-form-urlencoded > } [14 bytes data] * upload completely sent off: 14 out of 14 bytes * Mark bundle as not supporting multiuse < HTTP/1.1 200 OK < Date: Wed, 12 May 2021 07:18:50 GMT < Content-length: 2 < { [2 bytes data] 100 16 100 2 100 14 66 466 --:--:-- --:--:-- --:--:-- 533 * Connection #0 to host localhost left intact {} I also updated the webhook handler to return `404` if the supplied data cannot be parsed as valid JSON. Testing: - [x] Tested manually on Linux x64 Thanks, Erik ------------- Commit messages: - bot: modularize HTTP server Changes: https://git.openjdk.java.net/skara/pull/1149/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1149&range=00 Stats: 128 lines in 3 files changed: 80 ins; 16 del; 32 mod Patch: https://git.openjdk.java.net/skara/pull/1149.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1149/head:pull/1149 PR: https://git.openjdk.java.net/skara/pull/1149 From erikj at openjdk.java.net Wed May 12 12:34:57 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 12:34:57 GMT Subject: RFR: bot: modularize HTTP server In-Reply-To: References: Message-ID: <_h1lzx0d9e3Zx9JrcrUfH7Iec1fPneqwPJqdYa21PAI=.35d2f2a5-969a-4693-aac6-a653fc8ed245@github.com> On Wed, 12 May 2021 07:25:08 GMT, Erik Helin wrote: > Hi all, > > please review this patch that modularizes the bot HTTP server. The HTTP server featured by the bot runner is currently only used to process webhooks, but I have coming patches that extends it with other functionality. This refactoring make the bot runner start the actual server and then handlers can be configured in a configuration file. A minimal configuration file looks like: > > > { > "scratch": { > "path": "/tmp/skara/scratch" > }, > "storage": { > "path": "/tmp/skara/storage" > }, > "runner": { > "interval": "PT10S", > "watchdog": "PT30M", > "concurrency": 2 > }, > "log": { > "console": { > "level": "FINER" > } > }, > "http-server": { > "port": 8080, > "/api": { > "type": "webhook" > } > } > } > > > Using the above configuration stored in `config.json` the bot runner can then be started as: > > > $ make bots > $ ./bots/bin/bin/skara-bots $PWD/config.json > > > The HTTP server can be then be queried using e.g. `curl`: > > > $ curl --verbose --request POST --data '{"foo": "bar"}' http://localhost:8080/api > Note: Unnecessary use of -X or --request, POST is already inferred. > % Total % Received % Xferd Average Speed Time Time Time Current > Dload Upload Total Spent Left Speed > 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0* Trying 127.0.0.1:8080... > * TCP_NODELAY set > * Connected to localhost (127.0.0.1) port 8080 (#0) >> POST /api HTTP/1.1 >> Host: localhost:8080 >> User-Agent: curl/7.68.0 >> Accept: */* >> Content-Length: 14 >> Content-Type: application/x-www-form-urlencoded >> > } [14 bytes data] > * upload completely sent off: 14 out of 14 bytes > * Mark bundle as not supporting multiuse > < HTTP/1.1 200 OK > < Date: Wed, 12 May 2021 07:18:50 GMT > < Content-length: 2 > < > { [2 bytes data] > 100 16 100 2 100 14 66 466 --:--:-- --:--:-- --:--:-- 533 > * Connection #0 to host localhost left intact > {} > > > I also updated the webhook handler to return `404` if the supplied data cannot be parsed as valid JSON. > > Testing: > - [x] Tested manually on Linux x64 > > Thanks, > Erik bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 2: > 1: /* > 2: * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. Copyright should have a comma after each year. bot/src/main/java/org/openjdk/skara/bot/WebhookHandler.java line 2: > 1: /* > 2: * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. Comma after each year ------------- PR: https://git.openjdk.java.net/skara/pull/1149 From ehelin at openjdk.java.net Wed May 12 12:53:36 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 12:53:36 GMT Subject: RFR: metrics: add Prometheus exporter Message-ID: Hi all, please review this patch that adds a Prometheus exporter to the `metrics` package. The Prometheus format for metrics can be seen [here](https://prometheus.io/docs/instrumenting/exposition_formats/#text-format-details). I also added a bunch of unit tests for the exporter. Thanks, Erik ------------- Commit messages: - metrics: add Prometheus exporter Changes: https://git.openjdk.java.net/skara/pull/1150/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1150&range=00 Stats: 235 lines in 3 files changed: 233 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1150.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1150/head:pull/1150 PR: https://git.openjdk.java.net/skara/pull/1150 From ehelin at openjdk.java.net Wed May 12 12:53:41 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 12:53:41 GMT Subject: RFR: bot: modularize HTTP server [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that modularizes the bot HTTP server. The HTTP server featured by the bot runner is currently only used to process webhooks, but I have coming patches that extends it with other functionality. This refactoring make the bot runner start the actual server and then handlers can be configured in a configuration file. A minimal configuration file looks like: > > > { > "scratch": { > "path": "/tmp/skara/scratch" > }, > "storage": { > "path": "/tmp/skara/storage" > }, > "runner": { > "interval": "PT10S", > "watchdog": "PT30M", > "concurrency": 2 > }, > "log": { > "console": { > "level": "FINER" > } > }, > "http-server": { > "port": 8080, > "/api": { > "type": "webhook" > } > } > } > > > Using the above configuration stored in `config.json` the bot runner can then be started as: > > > $ make bots > $ ./bots/bin/bin/skara-bots $PWD/config.json > > > The HTTP server can be then be queried using e.g. `curl`: > > > $ curl --verbose --request POST --data '{"foo": "bar"}' http://localhost:8080/api > Note: Unnecessary use of -X or --request, POST is already inferred. > % Total % Received % Xferd Average Speed Time Time Time Current > Dload Upload Total Spent Left Speed > 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0* Trying 127.0.0.1:8080... > * TCP_NODELAY set > * Connected to localhost (127.0.0.1) port 8080 (#0) >> POST /api HTTP/1.1 >> Host: localhost:8080 >> User-Agent: curl/7.68.0 >> Accept: */* >> Content-Length: 14 >> Content-Type: application/x-www-form-urlencoded >> > } [14 bytes data] > * upload completely sent off: 14 out of 14 bytes > * Mark bundle as not supporting multiuse > < HTTP/1.1 200 OK > < Date: Wed, 12 May 2021 07:18:50 GMT > < Content-length: 2 > < > { [2 bytes data] > 100 16 100 2 100 14 66 466 --:--:-- --:--:-- --:--:-- 533 > * Connection #0 to host localhost left intact > {} > > > I also updated the webhook handler to return `404` if the supplied data cannot be parsed as valid JSON. > > Testing: > - [x] Tested manually on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request incrementally with two additional commits since the last revision: - Update bot/src/main/java/org/openjdk/skara/bot/WebhookHandler.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> - Update bot/src/main/java/org/openjdk/skara/bot/BotRunner.java Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1149/files - new: https://git.openjdk.java.net/skara/pull/1149/files/c7966cc8..e421184e Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1149&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1149&range=00-01 Stats: 2 lines in 2 files changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1149.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1149/head:pull/1149 PR: https://git.openjdk.java.net/skara/pull/1149 From erikj at openjdk.java.net Wed May 12 12:53:42 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 12:53:42 GMT Subject: RFR: bot: modularize HTTP server [v2] In-Reply-To: References: Message-ID: On Wed, 12 May 2021 12:51:06 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that modularizes the bot HTTP server. The HTTP server featured by the bot runner is currently only used to process webhooks, but I have coming patches that extends it with other functionality. This refactoring make the bot runner start the actual server and then handlers can be configured in a configuration file. A minimal configuration file looks like: >> >> >> { >> "scratch": { >> "path": "/tmp/skara/scratch" >> }, >> "storage": { >> "path": "/tmp/skara/storage" >> }, >> "runner": { >> "interval": "PT10S", >> "watchdog": "PT30M", >> "concurrency": 2 >> }, >> "log": { >> "console": { >> "level": "FINER" >> } >> }, >> "http-server": { >> "port": 8080, >> "/api": { >> "type": "webhook" >> } >> } >> } >> >> >> Using the above configuration stored in `config.json` the bot runner can then be started as: >> >> >> $ make bots >> $ ./bots/bin/bin/skara-bots $PWD/config.json >> >> >> The HTTP server can be then be queried using e.g. `curl`: >> >> >> $ curl --verbose --request POST --data '{"foo": "bar"}' http://localhost:8080/api >> Note: Unnecessary use of -X or --request, POST is already inferred. >> % Total % Received % Xferd Average Speed Time Time Time Current >> Dload Upload Total Spent Left Speed >> 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0* Trying 127.0.0.1:8080... >> * TCP_NODELAY set >> * Connected to localhost (127.0.0.1) port 8080 (#0) >>> POST /api HTTP/1.1 >>> Host: localhost:8080 >>> User-Agent: curl/7.68.0 >>> Accept: */* >>> Content-Length: 14 >>> Content-Type: application/x-www-form-urlencoded >>> >> } [14 bytes data] >> * upload completely sent off: 14 out of 14 bytes >> * Mark bundle as not supporting multiuse >> < HTTP/1.1 200 OK >> < Date: Wed, 12 May 2021 07:18:50 GMT >> < Content-length: 2 >> < >> { [2 bytes data] >> 100 16 100 2 100 14 66 466 --:--:-- --:--:-- --:--:-- 533 >> * Connection #0 to host localhost left intact >> {} >> >> >> I also updated the webhook handler to return `404` if the supplied data cannot be parsed as valid JSON. >> >> Testing: >> - [x] Tested manually on Linux x64 >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with two additional commits since the last revision: > > - Update bot/src/main/java/org/openjdk/skara/bot/WebhookHandler.java > > Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> > - Update bot/src/main/java/org/openjdk/skara/bot/BotRunner.java > > Co-authored-by: Erik Joelsson <37597443+erikj79 at users.noreply.github.com> Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1149 From ehelin at openjdk.java.net Wed May 12 13:03:38 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 13:03:38 GMT Subject: Integrated: bot: modularize HTTP server In-Reply-To: References: Message-ID: On Wed, 12 May 2021 07:25:08 GMT, Erik Helin wrote: > Hi all, > > please review this patch that modularizes the bot HTTP server. The HTTP server featured by the bot runner is currently only used to process webhooks, but I have coming patches that extends it with other functionality. This refactoring make the bot runner start the actual server and then handlers can be configured in a configuration file. A minimal configuration file looks like: > > > { > "scratch": { > "path": "/tmp/skara/scratch" > }, > "storage": { > "path": "/tmp/skara/storage" > }, > "runner": { > "interval": "PT10S", > "watchdog": "PT30M", > "concurrency": 2 > }, > "log": { > "console": { > "level": "FINER" > } > }, > "http-server": { > "port": 8080, > "/api": { > "type": "webhook" > } > } > } > > > Using the above configuration stored in `config.json` the bot runner can then be started as: > > > $ make bots > $ ./bots/bin/bin/skara-bots $PWD/config.json > > > The HTTP server can be then be queried using e.g. `curl`: > > > $ curl --verbose --request POST --data '{"foo": "bar"}' http://localhost:8080/api > Note: Unnecessary use of -X or --request, POST is already inferred. > % Total % Received % Xferd Average Speed Time Time Time Current > Dload Upload Total Spent Left Speed > 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0* Trying 127.0.0.1:8080... > * TCP_NODELAY set > * Connected to localhost (127.0.0.1) port 8080 (#0) >> POST /api HTTP/1.1 >> Host: localhost:8080 >> User-Agent: curl/7.68.0 >> Accept: */* >> Content-Length: 14 >> Content-Type: application/x-www-form-urlencoded >> > } [14 bytes data] > * upload completely sent off: 14 out of 14 bytes > * Mark bundle as not supporting multiuse > < HTTP/1.1 200 OK > < Date: Wed, 12 May 2021 07:18:50 GMT > < Content-length: 2 > < > { [2 bytes data] > 100 16 100 2 100 14 66 466 --:--:-- --:--:-- --:--:-- 533 > * Connection #0 to host localhost left intact > {} > > > I also updated the webhook handler to return `404` if the supplied data cannot be parsed as valid JSON. > > Testing: > - [x] Tested manually on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: 2e7c62db Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2e7c62db0efd3abd2d3ca54aebf3f725817e502b Stats: 128 lines in 3 files changed: 80 ins; 16 del; 32 mod bot: modularize HTTP server Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1149 From ehelin at openjdk.java.net Wed May 12 13:06:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 13:06:15 GMT Subject: RFR: bot: add Bot.name and WorkItem.botName Message-ID: <0wJk28JriEyQZMVo7veQ17VZiCDLr1KwU_qzHqnUuvA=.81d6b571-09c9-49dc-a8b2-f315c3afd002@github.com> Hi all, please review this patch that adds the methods `Bot.name` and `WorkItem.botName`. These methods are useful when adding metrics to code that deals with Bots and WorkItems (one often wants to create a `"bot"` label). I opted to add `static final` variables to the factories to ensure that names ending up as label values matches the names in the configuration files. Thanks, Erik ------------- Commit messages: - bot: add Bot.name and WorkItem.botName Changes: https://git.openjdk.java.net/skara/pull/1151/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1151&range=00 Stats: 279 lines in 53 files changed: 263 ins; 0 del; 16 mod Patch: https://git.openjdk.java.net/skara/pull/1151.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1151/head:pull/1151 PR: https://git.openjdk.java.net/skara/pull/1151 From erikj at openjdk.java.net Wed May 12 15:39:57 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 15:39:57 GMT Subject: RFR: metrics: add Prometheus exporter In-Reply-To: References: Message-ID: On Wed, 12 May 2021 12:50:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a Prometheus exporter to the `metrics` package. The Prometheus format for metrics can be seen [here](https://prometheus.io/docs/instrumenting/exposition_formats/#text-format-details). I also added a bunch of unit tests for the exporter. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1150 From erikj at openjdk.java.net Wed May 12 15:43:49 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 15:43:49 GMT Subject: RFR: bot: add Bot.name and WorkItem.botName In-Reply-To: <0wJk28JriEyQZMVo7veQ17VZiCDLr1KwU_qzHqnUuvA=.81d6b571-09c9-49dc-a8b2-f315c3afd002@github.com> References: <0wJk28JriEyQZMVo7veQ17VZiCDLr1KwU_qzHqnUuvA=.81d6b571-09c9-49dc-a8b2-f315c3afd002@github.com> Message-ID: On Wed, 12 May 2021 13:02:51 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the methods `Bot.name` and `WorkItem.botName`. These methods are useful when adding metrics to code that deals with Bots and WorkItems (one often wants to create a `"bot"` label). I opted to add `static final` variables to the factories to ensure that names ending up as label values matches the names in the configuration files. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1151 From ehelin at openjdk.java.net Wed May 12 17:54:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 17:54:50 GMT Subject: Integrated: metrics: add Prometheus exporter In-Reply-To: References: Message-ID: On Wed, 12 May 2021 12:50:26 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a Prometheus exporter to the `metrics` package. The Prometheus format for metrics can be seen [here](https://prometheus.io/docs/instrumenting/exposition_formats/#text-format-details). I also added a bunch of unit tests for the exporter. > > Thanks, > Erik This pull request has now been integrated. Changeset: 9ecf6bd7 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/9ecf6bd747518fe33c24909026397b9d20fdbb2c Stats: 235 lines in 3 files changed: 233 ins; 0 del; 2 mod metrics: add Prometheus exporter Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1150 From ehelin at openjdk.java.net Wed May 12 17:54:57 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 17:54:57 GMT Subject: Integrated: bot: add Bot.name and WorkItem.botName In-Reply-To: <0wJk28JriEyQZMVo7veQ17VZiCDLr1KwU_qzHqnUuvA=.81d6b571-09c9-49dc-a8b2-f315c3afd002@github.com> References: <0wJk28JriEyQZMVo7veQ17VZiCDLr1KwU_qzHqnUuvA=.81d6b571-09c9-49dc-a8b2-f315c3afd002@github.com> Message-ID: <1Tljl7bNL7vtxu1B-RSf6wRKId9O8PR3Z-BmEMpNYuk=.5725d2ac-2a06-41c8-bb63-871806bc2b25@github.com> On Wed, 12 May 2021 13:02:51 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the methods `Bot.name` and `WorkItem.botName`. These methods are useful when adding metrics to code that deals with Bots and WorkItems (one often wants to create a `"bot"` label). I opted to add `static final` variables to the factories to ensure that names ending up as label values matches the names in the configuration files. > > Thanks, > Erik This pull request has now been integrated. Changeset: aa4f7115 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/aa4f711521523dee3d3b5a94bfa0eb4404408568 Stats: 279 lines in 53 files changed: 263 ins; 0 del; 16 mod bot: add Bot.name and WorkItem.botName Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1151 From ehelin at openjdk.java.net Wed May 12 17:59:37 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 17:59:37 GMT Subject: RFR: bot: add metrics HTTP handler Message-ID: <1YMvXZfHgnfYf7Kvn71be7mwO-4tgN4q4XuVBKuDz3c=.8ceb4595-546d-4c58-80ee-28031e901c40@github.com> Hi all, please review this patch that adds an HTTP handler for metrics to the bot runner. Typically listening on the `/metrics` path the handler will return metrics according to Prometheus text format. Testing: - [x] Tested manually with a Prometheus instance on Linux x64 Thanks, Erik ------------- Commit messages: - bot: add metrics HTTP handler Changes: https://git.openjdk.java.net/skara/pull/1152/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1152&range=00 Stats: 63 lines in 3 files changed: 62 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1152.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1152/head:pull/1152 PR: https://git.openjdk.java.net/skara/pull/1152 From erikj at openjdk.java.net Wed May 12 18:08:38 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 18:08:38 GMT Subject: RFR: bot: add metrics HTTP handler In-Reply-To: <1YMvXZfHgnfYf7Kvn71be7mwO-4tgN4q4XuVBKuDz3c=.8ceb4595-546d-4c58-80ee-28031e901c40@github.com> References: <1YMvXZfHgnfYf7Kvn71be7mwO-4tgN4q4XuVBKuDz3c=.8ceb4595-546d-4c58-80ee-28031e901c40@github.com> Message-ID: On Wed, 12 May 2021 17:56:36 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds an HTTP handler for metrics to the bot runner. Typically listening on the `/metrics` path the handler will return metrics according to Prometheus text format. > > Testing: > - [x] Tested manually with a Prometheus instance on Linux x64 > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1152 From ehelin at openjdk.java.net Wed May 12 18:16:24 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 18:16:24 GMT Subject: Integrated: bot: add metrics HTTP handler In-Reply-To: <1YMvXZfHgnfYf7Kvn71be7mwO-4tgN4q4XuVBKuDz3c=.8ceb4595-546d-4c58-80ee-28031e901c40@github.com> References: <1YMvXZfHgnfYf7Kvn71be7mwO-4tgN4q4XuVBKuDz3c=.8ceb4595-546d-4c58-80ee-28031e901c40@github.com> Message-ID: On Wed, 12 May 2021 17:56:36 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds an HTTP handler for metrics to the bot runner. Typically listening on the `/metrics` path the handler will return metrics according to Prometheus text format. > > Testing: > - [x] Tested manually with a Prometheus instance on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: fa30c6c1 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/fa30c6c1005e42ddfe7c42e204386ab2c4933c48 Stats: 63 lines in 3 files changed: 62 ins; 0 del; 1 mod bot: add metrics HTTP handler Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1152 From ehelin at openjdk.java.net Wed May 12 18:21:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 18:21:56 GMT Subject: RFR: bot: add counters to BotRunner Message-ID: Hi all, please review this patch that adds a few counters to the bot runner. I've added counters for: - exception being thrown by a work item - a work item being scheduled to be executed - a work item being discarded due to a more recent version of the item being enqueued for execution All counters have the bot's name as a label to make it easy to view counters for individual bots (for example number of exceptions thrown per bot). Testing: - [x] Tested locally on Linux x64 using a local Prometheus instance and a local build of the bots Thanks, Erik ------------- Commit messages: - bot: add counters to BotRunner Changes: https://git.openjdk.java.net/skara/pull/1153/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1153&range=00 Stats: 11 lines in 1 file changed: 11 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1153.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1153/head:pull/1153 PR: https://git.openjdk.java.net/skara/pull/1153 From erikj at openjdk.java.net Wed May 12 18:29:24 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 18:29:24 GMT Subject: RFR: bot: add counters to BotRunner In-Reply-To: References: Message-ID: On Wed, 12 May 2021 18:19:06 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a few counters to the bot runner. I've added counters for: > > - exception being thrown by a work item > - a work item being scheduled to be executed > - a work item being discarded due to a more recent version of the item being enqueued for execution > > All counters have the bot's name as a label to make it easy to view counters for individual bots (for example number of exceptions thrown per bot). > > Testing: > - [x] Tested locally on Linux x64 using a local Prometheus instance and a local build of the bots > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1153 From ehelin at openjdk.java.net Wed May 12 18:33:27 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 18:33:27 GMT Subject: Integrated: bot: add counters to BotRunner In-Reply-To: References: Message-ID: <5KuA3K6JYjDQzgbS38oT6aLWUZS4cijHl3SddbA3_bc=.d4c6317e-e791-42f6-b236-c571271e49ef@github.com> On Wed, 12 May 2021 18:19:06 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a few counters to the bot runner. I've added counters for: > > - exception being thrown by a work item > - a work item being scheduled to be executed > - a work item being discarded due to a more recent version of the item being enqueued for execution > > All counters have the bot's name as a label to make it easy to view counters for individual bots (for example number of exceptions thrown per bot). > > Testing: > - [x] Tested locally on Linux x64 using a local Prometheus instance and a local build of the bots > > Thanks, > Erik This pull request has now been integrated. Changeset: 2565015d Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2565015dd34d8420e5d74b8b48761d7dca4fd331 Stats: 11 lines in 1 file changed: 11 ins; 0 del; 0 mod bot: add counters to BotRunner Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1153 From ehelin at openjdk.java.net Wed May 12 18:36:25 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 18:36:25 GMT Subject: RFR: bot: add readiness handler Message-ID: Hi all, please review this patch that adds a "readiness" handler to the bot runner's HTTP server. A readiness handler can be used to automate deployments and are usually queried to see when a service is ready to do work. Typically listening on paths such a `/ready` the readiness can help automatic deployment software differentiate between the two states "started" and "ready to work". The "readiness" handler will return `200` when the bot runner is ready to work and `404` when it isn't. Thanks, Erik ------------- Commit messages: - bot: add readiness handler Changes: https://git.openjdk.java.net/skara/pull/1154/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1154&range=00 Stats: 67 lines in 3 files changed: 66 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1154.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1154/head:pull/1154 PR: https://git.openjdk.java.net/skara/pull/1154 From erikj at openjdk.java.net Wed May 12 18:39:59 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 18:39:59 GMT Subject: RFR: bot: add readiness handler In-Reply-To: References: Message-ID: <3GD_DZuqBl0WQ67AEZDW8H-3I-F1_upws0x12DAYkkU=.9a4f2ba5-2e0a-4b5a-898c-45f1965b2c65@github.com> On Wed, 12 May 2021 18:33:22 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a "readiness" handler to the bot runner's HTTP server. A readiness handler can be used to automate deployments and are usually queried to see when a service is ready to do work. Typically listening on paths such a `/ready` the readiness can help automatic deployment software differentiate between the two states "started" and "ready to work". The "readiness" handler will return `200` when the bot runner is ready to work and `404` when it isn't. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1154 From ehelin at openjdk.java.net Wed May 12 19:23:06 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 19:23:06 GMT Subject: Integrated: bot: add readiness handler In-Reply-To: References: Message-ID: On Wed, 12 May 2021 18:33:22 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a "readiness" handler to the bot runner's HTTP server. A readiness handler can be used to automate deployments and are usually queried to see when a service is ready to do work. Typically listening on paths such a `/ready` the readiness can help automatic deployment software differentiate between the two states "started" and "ready to work". The "readiness" handler will return `200` when the bot runner is ready to work and `404` when it isn't. > > Thanks, > Erik This pull request has now been integrated. Changeset: 8cbcc1ab Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/8cbcc1abbba2849381a2790289ac1583268587b4 Stats: 67 lines in 3 files changed: 66 ins; 0 del; 1 mod bot: add readiness handler Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1154 From ehelin at openjdk.java.net Wed May 12 19:38:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 12 May 2021 19:38:15 GMT Subject: RFR: bot: add liveness handler Message-ID: Hi all, please review this patch that adds a liveness handler to the bot runner's HTTP server. The liveness handler, typically acting on the `/healthz` path, returns `200` if everything is well and `500` otherwise. Thanks, Erik ------------- Commit messages: - bot: add liveness handler Changes: https://git.openjdk.java.net/skara/pull/1155/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1155&range=00 Stats: 64 lines in 3 files changed: 63 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1155.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1155/head:pull/1155 PR: https://git.openjdk.java.net/skara/pull/1155 From erikj at openjdk.java.net Wed May 12 19:42:54 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 19:42:54 GMT Subject: RFR: bot: add liveness handler In-Reply-To: References: Message-ID: <8SvXvRV06lZh2QMM12PK99vqfGoFbHfZU2l1X9_fZAw=.016d4991-a12f-40b5-ae91-f04d8e3025ea@github.com> On Wed, 12 May 2021 19:35:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a liveness handler to the bot runner's HTTP server. The liveness handler, typically acting on the `/healthz` path, returns `200` if everything is well and `500` otherwise. > > Thanks, > Erik bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 241: > 239: > 240: boolean isHealthy() { > 241: return true; I think this implementation is a tad optimistic regarding the health of the runner. :) But I also think defining healthy can be tricky. ------------- PR: https://git.openjdk.java.net/skara/pull/1155 From erikj at openjdk.java.net Wed May 12 19:57:44 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 19:57:44 GMT Subject: RFR: bot: add liveness handler In-Reply-To: References: Message-ID: On Wed, 12 May 2021 19:35:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a liveness handler to the bot runner's HTTP server. The liveness handler, typically acting on the `/healthz` path, returns `200` if everything is well and `500` otherwise. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1155 From erikj at openjdk.java.net Wed May 12 19:57:45 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 19:57:45 GMT Subject: RFR: bot: add liveness handler In-Reply-To: <8SvXvRV06lZh2QMM12PK99vqfGoFbHfZU2l1X9_fZAw=.016d4991-a12f-40b5-ae91-f04d8e3025ea@github.com> References: <8SvXvRV06lZh2QMM12PK99vqfGoFbHfZU2l1X9_fZAw=.016d4991-a12f-40b5-ae91-f04d8e3025ea@github.com> Message-ID: <-A69-tfDeRbQOmkyrkMSQiJ5kxPkiALMfOG08YE4Zm4=.5586a4aa-c2fa-42d2-a3c4-93388a49ff3d@github.com> On Wed, 12 May 2021 19:40:38 GMT, Erik Joelsson wrote: >> Hi all, >> >> please review this patch that adds a liveness handler to the bot runner's HTTP server. The liveness handler, typically acting on the `/healthz` path, returns `200` if everything is well and `500` otherwise. >> >> Thanks, >> Erik > > bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 241: > >> 239: >> 240: boolean isHealthy() { >> 241: return true; > > I think this implementation is a tad optimistic regarding the health of the runner. :) But I also think defining healthy can be tricky. I don't have any better idea right now. We may want to revisit this later. ------------- PR: https://git.openjdk.java.net/skara/pull/1155 From erikj at openjdk.java.net Wed May 12 21:38:44 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 21:38:44 GMT Subject: [cr] RFR: 1015: Webrev can't handle changes with binary files Message-ID: Please review this fix, which fixes handling of binary files in webrev diffs. We should not even attempt to show diffs for binary files. ------------- Commit messages: - SKARA-1015 Changes: https://git.openjdk.java.net/cr/pull/16/files Webrev: https://webrevs.openjdk.java.net/?repo=cr&pr=16&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1015 Stats: 164 lines in 1 file changed: 54 ins; 22 del; 88 mod Patch: https://git.openjdk.java.net/cr/pull/16.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/16/head:pull/16 PR: https://git.openjdk.java.net/cr/pull/16 From erikj at openjdk.java.net Wed May 12 22:16:18 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 12 May 2021 22:16:18 GMT Subject: RFR: 1030: Lots of "uncleanable" repos found in scratch dirs Message-ID: This patch tries to fix a problem where bots will often generate "uncleanable" repos in the scratch area. This is often caused by the initial clone of the repo being interrupted for some reason (usually bot restart). By cloning into a temp dir and then moving in place, we can easily tell if an existing scratch repo was fully cloned or not. ------------- Commit messages: - Add logging - SKARA-1030 Changes: https://git.openjdk.java.net/skara/pull/1156/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1156&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1030 Stats: 10 lines in 1 file changed: 9 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1156.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1156/head:pull/1156 PR: https://git.openjdk.java.net/skara/pull/1156 From ehelin at openjdk.java.net Thu May 13 07:50:07 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 13 May 2021 07:50:07 GMT Subject: RFR: 1030: Lots of "uncleanable" repos found in scratch dirs In-Reply-To: References: Message-ID: On Wed, 12 May 2021 22:13:10 GMT, Erik Joelsson wrote: > This patch tries to fix a problem where bots will often generate "uncleanable" repos in the scratch area. This is often caused by the initial clone of the repo being interrupted for some reason (usually bot restart). By cloning into a temp dir and then moving in place, we can easily tell if an existing scratch repo was fully cloned or not. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1156 From ehelin at openjdk.java.net Thu May 13 07:50:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 13 May 2021 07:50:08 GMT Subject: Integrated: bot: add liveness handler In-Reply-To: References: Message-ID: On Wed, 12 May 2021 19:35:16 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a liveness handler to the bot runner's HTTP server. The liveness handler, typically acting on the `/healthz` path, returns `200` if everything is well and `500` otherwise. > > Thanks, > Erik This pull request has now been integrated. Changeset: 3325d487 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3325d487c8b1ff29d7a70bf0bea595264cc2000e Stats: 64 lines in 3 files changed: 63 ins; 0 del; 1 mod bot: add liveness handler Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1155 From erikj at openjdk.java.net Thu May 13 12:57:12 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 13 May 2021 12:57:12 GMT Subject: Integrated: 1030: Lots of "uncleanable" repos found in scratch dirs In-Reply-To: References: Message-ID: On Wed, 12 May 2021 22:13:10 GMT, Erik Joelsson wrote: > This patch tries to fix a problem where bots will often generate "uncleanable" repos in the scratch area. This is often caused by the initial clone of the repo being interrupted for some reason (usually bot restart). By cloning into a temp dir and then moving in place, we can easily tell if an existing scratch repo was fully cloned or not. This pull request has now been integrated. Changeset: 183323f7 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/183323f7be988d5df053a22180df5e6c2b96ef20 Stats: 10 lines in 1 file changed: 9 ins; 0 del; 1 mod 1030: Lots of "uncleanable" repos found in scratch dirs Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1156 From erikj at openjdk.java.net Fri May 14 20:29:04 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 14 May 2021 20:29:04 GMT Subject: RFR: 1042: Watchdog causing multiple restarts for mlbridge Message-ID: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> When starting certain bots with a fresh scratch area, we currently end up in a restart loop. This is because all the threads immediately get busy cloning repos, which starves out the watchdog pings for longer than the hard coded 10 minutes. This patch changes the watchdog to use the configuration setting "watchdog" for the restart timeout instead. This value is currently used for a log warning which is also driven by the watchdog, so to be able to still have separate values, I've introduced a new option "watchdog_warn" which can optionally be set for just the warning part. In addition to this, I also added a bit more logging to make it easier to follow through logstash when watchdog pings occur, or when a new instance of a bot runner is started. Failure to start due to configuration errors are now also posted using proper logs. ------------- Commit messages: - Only read watchdogWarnTimeout from config once - Add separate watchdog_warn config setting to fix test - Use watchdog timeout for restart instead of hardcoded 10m Changes: https://git.openjdk.java.net/skara/pull/1157/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1157&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1042 Stats: 23 lines in 5 files changed: 15 ins; 0 del; 8 mod Patch: https://git.openjdk.java.net/skara/pull/1157.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1157/head:pull/1157 PR: https://git.openjdk.java.net/skara/pull/1157 From kcr at openjdk.java.net Fri May 14 21:08:26 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 14 May 2021 21:08:26 GMT Subject: RFR: 1042: Watchdog causing multiple restarts for mlbridge In-Reply-To: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> References: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> Message-ID: On Fri, 14 May 2021 20:25:27 GMT, Erik Joelsson wrote: > When starting certain bots with a fresh scratch area, we currently end up in a restart loop. This is because all the threads immediately get busy cloning repos, which starves out the watchdog pings for longer than the hard coded 10 minutes. This patch changes the watchdog to use the configuration setting "watchdog" for the restart timeout instead. This value is currently used for a log warning which is also driven by the watchdog, so to be able to still have separate values, I've introduced a new option "watchdog_warn" which can optionally be set for just the warning part. > > In addition to this, I also added a bit more logging to make it easier to follow through logstash when watchdog pings occur, or when a new instance of a bot runner is started. Failure to start due to configuration errors are now also posted using proper logs. Looks good. ------------- Marked as reviewed by kcr (Committer). PR: https://git.openjdk.java.net/skara/pull/1157 From erikj at openjdk.java.net Fri May 14 23:22:19 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 14 May 2021 23:22:19 GMT Subject: RFR: Add SKARA_JAVA_OPTS env variable to launchers Message-ID: <3sDjKJQY1zeJTeW4JDxYhZ_lycIIxNNeK5cCpSrD060=.278b5885-b10c-4f84-88c0-b239449f1f6f@github.com> This change adds the possibility of adding java options used when running a Skara image (such as the bots) though the environment variable SKARA_JAVA_OPTS. ------------- Commit messages: - Add SKARA_JAVA_OPTS env variable to launchers Changes: https://git.openjdk.java.net/skara/pull/1158/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1158&range=00 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1158.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1158/head:pull/1158 PR: https://git.openjdk.java.net/skara/pull/1158 From kcr at openjdk.java.net Fri May 14 23:27:50 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 14 May 2021 23:27:50 GMT Subject: RFR: Add SKARA_JAVA_OPTS env variable to launchers In-Reply-To: <3sDjKJQY1zeJTeW4JDxYhZ_lycIIxNNeK5cCpSrD060=.278b5885-b10c-4f84-88c0-b239449f1f6f@github.com> References: <3sDjKJQY1zeJTeW4JDxYhZ_lycIIxNNeK5cCpSrD060=.278b5885-b10c-4f84-88c0-b239449f1f6f@github.com> Message-ID: <8pM0PDf97f6bwwaivpnviurOAHJgOOqNYSdKiFOJJwI=.e092bf87-c353-4377-a501-dca30f6750c5@github.com> On Fri, 14 May 2021 23:19:10 GMT, Erik Joelsson wrote: > This change adds the possibility of adding java options used when running a Skara image (such as the bots) though the environment variable SKARA_JAVA_OPTS. Looks good. ------------- Marked as reviewed by kcr (Committer). PR: https://git.openjdk.java.net/skara/pull/1158 From ehelin at openjdk.java.net Mon May 17 13:04:34 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 17 May 2021 13:04:34 GMT Subject: RFR: 1042: Watchdog causing multiple restarts for mlbridge In-Reply-To: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> References: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> Message-ID: On Fri, 14 May 2021 20:25:27 GMT, Erik Joelsson wrote: > When starting certain bots with a fresh scratch area, we currently end up in a restart loop. This is because all the threads immediately get busy cloning repos, which starves out the watchdog pings for longer than the hard coded 10 minutes. This patch changes the watchdog to use the configuration setting "watchdog" for the restart timeout instead. This value is currently used for a log warning which is also driven by the watchdog, so to be able to still have separate values, I've introduced a new option "watchdog_warn" which can optionally be set for just the warning part. > > In addition to this, I also added a bit more logging to make it easier to follow through logstash when watchdog pings occur, or when a new instance of a bot runner is started. Failure to start due to configuration errors are now also posted using proper logs. Looks good. Please see my question/comment in-line. bots/cli/src/main/java/org/openjdk/skara/bots/cli/BotLauncher.java line 172: > 170: runnerConfig = BotRunnerConfiguration.parse(jsonConfig, jsonFile.getParent()); > 171: } catch (ConfigurationError configurationError) { > 172: log.severe("Failed to parse configuration file: " + jsonFile Will this actually log anything if there is no logging configured? `applyLogging` resets the `LogManager` and the `BotConsoleHandler` is only added if `log.console` is configured. Would it be wise to both print to standard out and log? ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1157 From ehelin at openjdk.java.net Mon May 17 13:06:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 17 May 2021 13:06:22 GMT Subject: RFR: Add SKARA_JAVA_OPTS env variable to launchers In-Reply-To: <3sDjKJQY1zeJTeW4JDxYhZ_lycIIxNNeK5cCpSrD060=.278b5885-b10c-4f84-88c0-b239449f1f6f@github.com> References: <3sDjKJQY1zeJTeW4JDxYhZ_lycIIxNNeK5cCpSrD060=.278b5885-b10c-4f84-88c0-b239449f1f6f@github.com> Message-ID: On Fri, 14 May 2021 23:19:10 GMT, Erik Joelsson wrote: > This change adds the possibility of adding java options used when running a Skara image (such as the bots) though the environment variable SKARA_JAVA_OPTS. Looks good ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1158 From erikj at openjdk.java.net Mon May 17 13:13:09 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 17 May 2021 13:13:09 GMT Subject: Integrated: Add SKARA_JAVA_OPTS env variable to launchers In-Reply-To: <3sDjKJQY1zeJTeW4JDxYhZ_lycIIxNNeK5cCpSrD060=.278b5885-b10c-4f84-88c0-b239449f1f6f@github.com> References: <3sDjKJQY1zeJTeW4JDxYhZ_lycIIxNNeK5cCpSrD060=.278b5885-b10c-4f84-88c0-b239449f1f6f@github.com> Message-ID: On Fri, 14 May 2021 23:19:10 GMT, Erik Joelsson wrote: > This change adds the possibility of adding java options used when running a Skara image (such as the bots) though the environment variable SKARA_JAVA_OPTS. This pull request has now been integrated. Changeset: 8ae7a241 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/8ae7a24122e38d00c1349bb31fd8231081e4abe4 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Add SKARA_JAVA_OPTS env variable to launchers Reviewed-by: kcr, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1158 From ehelin at openjdk.java.net Mon May 17 13:33:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 17 May 2021 13:33:22 GMT Subject: RFR: 1036: Extend bot config files to support comments Message-ID: Hi all, please review this patch that extends the `JSON` parser to optionally allow both comments and trailing commas (i.e. [JWCC](https://nigeltao.github.io/blog/2021/json-with-commas-comments.html)). I also modified the bot launcher to now use JWCC for its configuration files instead of plain JSON (to allow comments and trailing commas). Note that no other code is updated to use JWCC, so all networking code etc. will still use regular old JSON. I also added a bunch of tests for the new JWCC "mode". Thanks, Erik ------------- Commit messages: - skara-1036 Changes: https://git.openjdk.java.net/skara/pull/1159/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1159&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1036 Stats: 343 lines in 4 files changed: 337 ins; 0 del; 6 mod Patch: https://git.openjdk.java.net/skara/pull/1159.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1159/head:pull/1159 PR: https://git.openjdk.java.net/skara/pull/1159 From ehelin at openjdk.java.net Mon May 17 13:36:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 17 May 2021 13:36:40 GMT Subject: [cr] RFR: 1015: Webrev can't handle changes with binary files In-Reply-To: References: Message-ID: On Wed, 12 May 2021 21:35:37 GMT, Erik Joelsson wrote: > Please review this fix, which fixes handling of binary files in webrev diffs. We should not even attempt to show diffs for binary files. index.html line 1506: > 1504: function removeContext(patch) { > 1505: const hunks = new Array(); > 1506: if (patch != null) { Maybe do an early return instead? As in if (patch === null) { return hunks; } That way you don't have to re-indent the entire method ?? ------------- PR: https://git.openjdk.java.net/cr/pull/16 From erikj at openjdk.java.net Mon May 17 13:37:05 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 17 May 2021 13:37:05 GMT Subject: RFR: 1036: Extend bot config files to support comments In-Reply-To: References: Message-ID: On Mon, 17 May 2021 13:30:17 GMT, Erik Helin wrote: > Hi all, > > please review this patch that extends the `JSON` parser to optionally allow both comments and trailing commas (i.e. [JWCC](https://nigeltao.github.io/blog/2021/json-with-commas-comments.html)). I also modified the bot launcher to now use JWCC for its configuration files instead of plain JSON (to allow comments and trailing commas). Note that no other code is updated to use JWCC, so all networking code etc. will still use regular old JSON. > > I also added a bunch of tests for the new JWCC "mode". > > Thanks, > Erik Looks good! ------------- Marked as reviewed by erikj (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1159 From erikj at openjdk.java.net Mon May 17 13:46:39 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 17 May 2021 13:46:39 GMT Subject: [cr] RFR: 1015: Webrev can't handle changes with binary files [v2] In-Reply-To: References: Message-ID: > Please review this fix, which fixes handling of binary files in webrev diffs. We should not even attempt to show diffs for binary files. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Adjusted for review comments ------------- Changes: - all: https://git.openjdk.java.net/cr/pull/16/files - new: https://git.openjdk.java.net/cr/pull/16/files/2533bd59..e3c2a7b1 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=cr&pr=16&range=01 - incr: https://webrevs.openjdk.java.net/?repo=cr&pr=16&range=00-01 Stats: 87 lines in 1 file changed: 35 ins; 33 del; 19 mod Patch: https://git.openjdk.java.net/cr/pull/16.diff Fetch: git fetch https://git.openjdk.java.net/cr pull/16/head:pull/16 PR: https://git.openjdk.java.net/cr/pull/16 From erik.joelsson at oracle.com Mon May 17 17:04:41 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Mon, 17 May 2021 10:04:41 -0700 Subject: CFV: New Skara Reviewer: Kevin Rushforth Message-ID: I hereby nominate Kevin Rushforth to Skara Reviewer. Kevin is a long time member of the OpenJDK community with extensive experience in the ins and outs of the OpenJDK development process and source code repository management. He has graciously accepted to spend some of his time with the Skara project. Votes are due by 2021-05-31 11:00 PT. Only current Skara Reviewers [1] are eligible to vote on this nomination.? Votes must be cast in the open by replying to this mailing list. For Three-Vote Consensus voting instructions, see [2]. Erik Joelsson [1] https://openjdk.java.net/census [2] https://openjdk.java.net/projects/#reviewer-vote From erik.joelsson at oracle.com Mon May 17 17:05:39 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Mon, 17 May 2021 10:05:39 -0700 Subject: CFV: New Skara Reviewer: Kevin Rushforth In-Reply-To: References: Message-ID: <23ab0dec-23e5-d1bd-f675-dd6c0204bbe6@oracle.com> Vote: yes /Erik On 2021-05-17 10:04, erik.joelsson at oracle.com wrote: > I hereby nominate Kevin Rushforth to Skara Reviewer. > > Kevin is a long time member of the OpenJDK community with extensive > experience in the ins and outs of the OpenJDK development process and > source code repository management. He has graciously accepted to spend > some of his time with the Skara project. > > Votes are due by 2021-05-31 11:00 PT. > > Only current Skara Reviewers [1] are eligible to vote on this > nomination.? Votes must be cast in the open by replying to this > mailing list. > > For Three-Vote Consensus voting instructions, see [2]. > > Erik Joelsson > > [1] https://openjdk.java.net/census > [2] https://openjdk.java.net/projects/#reviewer-vote > From joe.darcy at oracle.com Mon May 17 17:11:04 2021 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 17 May 2021 10:11:04 -0700 Subject: CFV: New Skara Reviewer: Kevin Rushforth In-Reply-To: References: Message-ID: Vote: yes -Joe On 5/17/2021 10:04 AM, erik.joelsson at oracle.com wrote: > I hereby nominate Kevin Rushforth to Skara Reviewer. > > Kevin is a long time member of the OpenJDK community with extensive > experience in the ins and outs of the OpenJDK development process and > source code repository management. He has graciously accepted to spend > some of his time with the Skara project. > > Votes are due by 2021-05-31 11:00 PT. > > Only current Skara Reviewers [1] are eligible to vote on this > nomination.? Votes must be cast in the open by replying to this > mailing list. > > For Three-Vote Consensus voting instructions, see [2]. > > Erik Joelsson > > [1] https://openjdk.java.net/census > [2] https://openjdk.java.net/projects/#reviewer-vote > From erikj at openjdk.java.net Mon May 17 17:44:43 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 17 May 2021 17:44:43 GMT Subject: RFR: 1042: Watchdog causing multiple restarts for mlbridge [v2] In-Reply-To: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> References: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> Message-ID: > When starting certain bots with a fresh scratch area, we currently end up in a restart loop. This is because all the threads immediately get busy cloning repos, which starves out the watchdog pings for longer than the hard coded 10 minutes. This patch changes the watchdog to use the configuration setting "watchdog" for the restart timeout instead. This value is currently used for a log warning which is also driven by the watchdog, so to be able to still have separate values, I've introduced a new option "watchdog_warn" which can optionally be set for just the warning part. > > In addition to this, I also added a bit more logging to make it easier to follow through logstash when watchdog pings occur, or when a new instance of a bot runner is started. Failure to start due to configuration errors are now also posted using proper logs. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Restored direct printing of error messages ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1157/files - new: https://git.openjdk.java.net/skara/pull/1157/files/bb652d78..95691883 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1157&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1157&range=00-01 Stats: 5 lines in 1 file changed: 5 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1157.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1157/head:pull/1157 PR: https://git.openjdk.java.net/skara/pull/1157 From ehelin at openjdk.java.net Mon May 17 17:59:34 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 17 May 2021 17:59:34 GMT Subject: [cr] RFR: 1015: Webrev can't handle changes with binary files [v2] In-Reply-To: References: Message-ID: On Mon, 17 May 2021 13:46:39 GMT, Erik Joelsson wrote: >> Please review this fix, which fixes handling of binary files in webrev diffs. We should not even attempt to show diffs for binary files. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Adjusted for review comments Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/cr/pull/16 From ehelin at openjdk.java.net Mon May 17 18:00:09 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 17 May 2021 18:00:09 GMT Subject: Integrated: 1036: Extend bot config files to support comments In-Reply-To: References: Message-ID: On Mon, 17 May 2021 13:30:17 GMT, Erik Helin wrote: > Hi all, > > please review this patch that extends the `JSON` parser to optionally allow both comments and trailing commas (i.e. [JWCC](https://nigeltao.github.io/blog/2021/json-with-commas-comments.html)). I also modified the bot launcher to now use JWCC for its configuration files instead of plain JSON (to allow comments and trailing commas). Note that no other code is updated to use JWCC, so all networking code etc. will still use regular old JSON. > > I also added a bunch of tests for the new JWCC "mode". > > Thanks, > Erik This pull request has now been integrated. Changeset: f4a18b3b Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/f4a18b3bc7a433af637dbfdc484f8068f31a036c Stats: 343 lines in 4 files changed: 337 ins; 0 del; 6 mod 1036: Extend bot config files to support comments Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1159 From ehelin at openjdk.java.net Mon May 17 18:00:09 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 17 May 2021 18:00:09 GMT Subject: RFR: 1042: Watchdog causing multiple restarts for mlbridge [v2] In-Reply-To: References: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> Message-ID: On Mon, 17 May 2021 17:44:43 GMT, Erik Joelsson wrote: >> When starting certain bots with a fresh scratch area, we currently end up in a restart loop. This is because all the threads immediately get busy cloning repos, which starves out the watchdog pings for longer than the hard coded 10 minutes. This patch changes the watchdog to use the configuration setting "watchdog" for the restart timeout instead. This value is currently used for a log warning which is also driven by the watchdog, so to be able to still have separate values, I've introduced a new option "watchdog_warn" which can optionally be set for just the warning part. >> >> In addition to this, I also added a bit more logging to make it easier to follow through logstash when watchdog pings occur, or when a new instance of a bot runner is started. Failure to start due to configuration errors are now also posted using proper logs. > > Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: > > Restored direct printing of error messages Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1157 From erikj at openjdk.java.net Mon May 17 18:14:10 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 17 May 2021 18:14:10 GMT Subject: [cr] Integrated: 1015: Webrev can't handle changes with binary files In-Reply-To: References: Message-ID: <3zmPKUxPAO6u4iDvzTZrNniz2S-_IwEuIaJNryTUFFw=.0e06902a-1ba7-491a-bf74-fd2dfa67eb72@github.com> On Wed, 12 May 2021 21:35:37 GMT, Erik Joelsson wrote: > Please review this fix, which fixes handling of binary files in webrev diffs. We should not even attempt to show diffs for binary files. This pull request has now been integrated. Changeset: 8f3aff2b Author: Erik Joelsson URL: https://git.openjdk.java.net/cr/commit/8f3aff2ba4c6b9288f2d487da55e37e869404287 Stats: 98 lines in 1 file changed: 34 ins; 0 del; 64 mod 1015: Webrev can't handle changes with binary files Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/cr/pull/16 From tim.bell at oracle.com Mon May 17 18:15:50 2021 From: tim.bell at oracle.com (tim.bell at oracle.com) Date: Mon, 17 May 2021 11:15:50 -0700 Subject: CFV: New Skara Reviewer: Kevin Rushforth In-Reply-To: References: Message-ID: <2a2e181c-b50a-bf95-73a9-df91babca5ad@oracle.com> Vote: yes Tim On 5/17/21 10:04, erik.joelsson at oracle.com wrote: > I hereby nominate Kevin Rushforth to Skara Reviewer. From erikj at openjdk.java.net Tue May 18 14:05:13 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 18 May 2021 14:05:13 GMT Subject: RFR: metrics: add metrics for HotSpot In-Reply-To: References: Message-ID: On Tue, 18 May 2021 13:59:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds some default metrics for HotSpot to the default `CollectorRegistry` in the `metrics` package. > > Thanks, > Erik Marked as reviewed by erikj (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1160 From ehelin at openjdk.java.net Tue May 18 14:05:13 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 18 May 2021 14:05:13 GMT Subject: RFR: metrics: add metrics for HotSpot Message-ID: Hi all, please review this patch that adds some default metrics for HotSpot to the default `CollectorRegistry` in the `metrics` package. Thanks, Erik ------------- Commit messages: - metrics: add metrics for HotSpot Changes: https://git.openjdk.java.net/skara/pull/1160/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1160&range=00 Stats: 125 lines in 5 files changed: 100 ins; 0 del; 25 mod Patch: https://git.openjdk.java.net/skara/pull/1160.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1160/head:pull/1160 PR: https://git.openjdk.java.net/skara/pull/1160 From ehelin at openjdk.java.net Tue May 18 16:11:56 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Tue, 18 May 2021 16:11:56 GMT Subject: Integrated: metrics: add metrics for HotSpot In-Reply-To: References: Message-ID: On Tue, 18 May 2021 13:59:33 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds some default metrics for HotSpot to the default `CollectorRegistry` in the `metrics` package. > > Thanks, > Erik This pull request has now been integrated. Changeset: d73f9e53 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/d73f9e53b058791910e956c51f5c5614b8659ea1 Stats: 125 lines in 5 files changed: 100 ins; 0 del; 25 mod metrics: add metrics for HotSpot Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1160 From erikj at openjdk.java.net Tue May 18 23:01:53 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 18 May 2021 23:01:53 GMT Subject: RFR: 1000: mlbridge stuck failing on closed PR targeting a branch that no longer exists Message-ID: This patch fixes two related issues in mlbridge where the bot would fail with exception (and subsequently retry indefinitely while spamming admins with alarms) if the target branch or the integrated change of a PR no longer exists. My conclusion on how to fix this is to simply log a warning if either of these cases are detected and stop processing more. ------------- Commit messages: - SKARA-1000 Changes: https://git.openjdk.java.net/skara/pull/1161/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1161&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1000 Stats: 81 lines in 3 files changed: 78 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1161.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1161/head:pull/1161 PR: https://git.openjdk.java.net/skara/pull/1161 From ehelin at openjdk.java.net Wed May 19 10:07:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 19 May 2021 10:07:22 GMT Subject: RFR: 1000: mlbridge stuck failing on closed PR targeting a branch that no longer exists In-Reply-To: References: Message-ID: On Tue, 18 May 2021 22:58:30 GMT, Erik Joelsson wrote: > This patch fixes two related issues in mlbridge where the bot would fail with exception (and subsequently retry indefinitely while spamming admins with alarms) if the target branch or the integrated change of a PR no longer exists. My conclusion on how to fix this is to simply log a warning if either of these cases are detected and stop processing more. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1161 From lgxbslgx at gmail.com Wed May 19 12:30:09 2021 From: lgxbslgx at gmail.com (Guoxiong Li) Date: Wed, 19 May 2021 20:30:09 +0800 Subject: The status of the Pre-submit tests is not refreshed occasionally Message-ID: Hi all, The `Pre-submit tests` of some PRs, such as PR-3899[1], show the following messages: ``` Some checks haven?t completed yet 4 in progress and 8 successful checks ``` If we click the `check` or `details` button to see the details[2]. It shows the following messages: ``` openjdk-testinfo / Pre-submit tests - Linux x64 - Test (tier1) Started 12d 20h 16m 32s ago ``` But actually, the tests have already been completed at the `action`[3]. It seems that the robot would not check the `action` to refresh the status occasionally. I can't conclude when it will happen. It is intermittent. And it occurred at my several PRs in the past so that I was confused by it. Do I miss anything about the PRs? Is it a potential bug in skara or github? Any idea is appreciated. Thanks. [1] https://github.com/openjdk/jdk/pull/3899 [2] https://github.com/openjdk/jdk/pull/3899/checks?check_run_id=2520252171 [3] https://github.com/lgxbslgx/jdk/runs/2519840361 Best Regards, -- Guoxiong From erik.joelsson at oracle.com Wed May 19 12:36:07 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Wed, 19 May 2021 05:36:07 -0700 Subject: The status of the Pre-submit tests is not refreshed occasionally In-Reply-To: References: Message-ID: Hello Guoxiong, This looks like a Github issue to me. The reporting of Github actions in the PR is done by Github natively and is not something Skara is adding. /Erik On 2021-05-19 05:30, Guoxiong Li wrote: > Hi all, > > The `Pre-submit tests` of some PRs, such as PR-3899[1], show the following > messages: > > ``` > Some checks haven?t completed yet > 4 in progress and 8 successful checks > ``` > > If we click the `check` or `details` button to see the details[2]. It shows > the following messages: > > ``` > openjdk-testinfo / Pre-submit tests - Linux x64 - Test (tier1) > Started 12d 20h 16m 32s ago > ``` > > But actually, the tests have already been completed at the `action`[3]. > > It seems that the robot would not check the `action` to refresh the status > occasionally. > I can't conclude when it will happen. > It is intermittent. And it occurred at my several PRs in the past so that I > was confused by it. > > Do I miss anything about the PRs? Is it a potential bug in skara or github? > > Any idea is appreciated. Thanks. > > [1] https://github.com/openjdk/jdk/pull/3899 > [2] https://github.com/openjdk/jdk/pull/3899/checks?check_run_id=2520252171 > [3] https://github.com/lgxbslgx/jdk/runs/2519840361 > > Best Regards, > -- Guoxiong From ehelin at openjdk.java.net Wed May 19 13:19:55 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 19 May 2021 13:19:55 GMT Subject: RFR: 1029: Skara bot should prevent integration of PR with incorrect issue type Message-ID: Hi all, please review this patch that makes using a issue of type other than "Bug", "Enhancement", "Task", "Sub-task" or "New Feature" an integration blocker. We currently issue a warning, this warning has now been changed to an integration blocker. Testing: - [x] Updated a number of unit tests Thanks, Erik ------------- Commit messages: - skara-1029 Changes: https://git.openjdk.java.net/skara/pull/1162/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1162&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1029 Stats: 32 lines in 3 files changed: 13 ins; 4 del; 15 mod Patch: https://git.openjdk.java.net/skara/pull/1162.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1162/head:pull/1162 PR: https://git.openjdk.java.net/skara/pull/1162 From kcr at openjdk.java.net Wed May 19 13:29:46 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Wed, 19 May 2021 13:29:46 GMT Subject: RFR: 1029: Skara bot should prevent integration of PR with incorrect issue type In-Reply-To: References: Message-ID: On Wed, 19 May 2021 13:16:11 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes using a issue of type other than "Bug", "Enhancement", "Task", "Sub-task" or "New Feature" an integration blocker. We currently issue a warning, this warning has now been changed to an integration blocker. > > Testing: > - [x] Updated a number of unit tests > > Thanks, > Erik Looks good. ------------- Marked as reviewed by kcr (Committer). PR: https://git.openjdk.java.net/skara/pull/1162 From erikj at openjdk.java.net Wed May 19 15:25:56 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 19 May 2021 15:25:56 GMT Subject: RFR: 1029: Skara bot should prevent integration of PR with incorrect issue type In-Reply-To: References: Message-ID: On Wed, 19 May 2021 13:16:11 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes using a issue of type other than "Bug", "Enhancement", "Task", "Sub-task" or "New Feature" an integration blocker. We currently issue a warning, this warning has now been changed to an integration blocker. > > Testing: > - [x] Updated a number of unit tests > > Thanks, > Erik Marked as reviewed by erikj (Lead). ------------- PR: https://git.openjdk.java.net/skara/pull/1162 From erikj at openjdk.java.net Wed May 19 16:01:35 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 19 May 2021 16:01:35 GMT Subject: Integrated: 1000: mlbridge stuck failing on closed PR targeting a branch that no longer exists In-Reply-To: References: Message-ID: On Tue, 18 May 2021 22:58:30 GMT, Erik Joelsson wrote: > This patch fixes two related issues in mlbridge where the bot would fail with exception (and subsequently retry indefinitely while spamming admins with alarms) if the target branch or the integrated change of a PR no longer exists. My conclusion on how to fix this is to simply log a warning if either of these cases are detected and stop processing more. This pull request has now been integrated. Changeset: a3c582b9 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/a3c582b940593fd60cd56f7c9cc998bcd51141b8 Stats: 81 lines in 3 files changed: 78 ins; 0 del; 3 mod 1000: mlbridge stuck failing on closed PR targeting a branch that no longer exists Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1161 From ehelin at openjdk.java.net Thu May 20 08:59:14 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 20 May 2021 08:59:14 GMT Subject: Integrated: 1029: Skara bot should prevent integration of PR with incorrect issue type In-Reply-To: References: Message-ID: On Wed, 19 May 2021 13:16:11 GMT, Erik Helin wrote: > Hi all, > > please review this patch that makes using a issue of type other than "Bug", "Enhancement", "Task", "Sub-task" or "New Feature" an integration blocker. We currently issue a warning, this warning has now been changed to an integration blocker. > > Testing: > - [x] Updated a number of unit tests > > Thanks, > Erik This pull request has now been integrated. Changeset: 3111cc4a Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/3111cc4ac887cb0c469864ee93d2330b3c1caa69 Stats: 32 lines in 3 files changed: 13 ins; 4 del; 15 mod 1029: Skara bot should prevent integration of PR with incorrect issue type Reviewed-by: kcr, erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1162 From erikj at openjdk.java.net Fri May 21 22:30:58 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 21 May 2021 22:30:58 GMT Subject: Integrated: 1042: Watchdog causing multiple restarts for mlbridge In-Reply-To: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> References: <4nZedpgLhnjXeWKdcrt9-wYOd4PNGaL-9K00AQa_VNc=.5a1d038b-d4ee-43cc-b482-7be8d1e71fb8@github.com> Message-ID: On Fri, 14 May 2021 20:25:27 GMT, Erik Joelsson wrote: > When starting certain bots with a fresh scratch area, we currently end up in a restart loop. This is because all the threads immediately get busy cloning repos, which starves out the watchdog pings for longer than the hard coded 10 minutes. This patch changes the watchdog to use the configuration setting "watchdog" for the restart timeout instead. This value is currently used for a log warning which is also driven by the watchdog, so to be able to still have separate values, I've introduced a new option "watchdog_warn" which can optionally be set for just the warning part. > > In addition to this, I also added a bit more logging to make it easier to follow through logstash when watchdog pings occur, or when a new instance of a bot runner is started. Failure to start due to configuration errors are now also posted using proper logs. This pull request has now been integrated. Changeset: c1f86979 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/c1f869791e71a25c9b7e9f057a11a961b76ef37f Stats: 25 lines in 5 files changed: 20 ins; 0 del; 5 mod 1042: Watchdog causing multiple restarts for mlbridge Reviewed-by: kcr, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1157 From erikj at openjdk.java.net Fri May 21 22:57:00 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 21 May 2021 22:57:00 GMT Subject: RFR: 1049: Watchdog should change health status to unhealthy Message-ID: This patch adds a callback for the Watchdog, which is used to flip the isHealthy status to false when the watchdog triggers. This will help us to more quickly discover when a bot runner isn't working if System.exit() isn't working (which happened today). ------------- Commit messages: - SKARA-1049 Changes: https://git.openjdk.java.net/skara/pull/1163/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1163&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1049 Stats: 8 lines in 2 files changed: 5 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1163.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1163/head:pull/1163 PR: https://git.openjdk.java.net/skara/pull/1163 From kcr at openjdk.java.net Fri May 21 23:06:51 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Fri, 21 May 2021 23:06:51 GMT Subject: RFR: 1049: Watchdog should change health status to unhealthy In-Reply-To: References: Message-ID: On Fri, 21 May 2021 22:53:33 GMT, Erik Joelsson wrote: > This patch adds a callback for the Watchdog, which is used to flip the isHealthy status to false when the watchdog triggers. This will help us to more quickly discover when a bot runner isn't working if System.exit() isn't working (which happened today). Marked as reviewed by kcr (Committer). ------------- PR: https://git.openjdk.java.net/skara/pull/1163 From ehelin at openjdk.java.net Mon May 24 13:29:45 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 24 May 2021 13:29:45 GMT Subject: RFR: 1049: Watchdog should change health status to unhealthy In-Reply-To: References: Message-ID: <-0vZP4XlnYFVRx6drVBD9TpymAnOikukn67LE_MgIr0=.bf64c2b8-03ee-444f-b9ae-deb29c77428b@github.com> On Fri, 21 May 2021 22:53:33 GMT, Erik Joelsson wrote: > This patch adds a callback for the Watchdog, which is used to flip the isHealthy status to false when the watchdog triggers. This will help us to more quickly discover when a bot runner isn't working if System.exit() isn't working (which happened today). Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1163 From erikj at openjdk.java.net Mon May 24 13:33:00 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Mon, 24 May 2021 13:33:00 GMT Subject: Integrated: 1049: Watchdog should change health status to unhealthy In-Reply-To: References: Message-ID: On Fri, 21 May 2021 22:53:33 GMT, Erik Joelsson wrote: > This patch adds a callback for the Watchdog, which is used to flip the isHealthy status to false when the watchdog triggers. This will help us to more quickly discover when a bot runner isn't working if System.exit() isn't working (which happened today). This pull request has now been integrated. Changeset: bcf27471 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/bcf27471dc8894475c1b298878b05e60b31ba131 Stats: 8 lines in 2 files changed: 5 ins; 0 del; 3 mod 1049: Watchdog should change health status to unhealthy Reviewed-by: kcr, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1163 From ehelin at openjdk.java.net Mon May 24 13:55:02 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 24 May 2021 13:55:02 GMT Subject: RFR: bot: add profile handler Message-ID: Hi all, please review this patch that adds a "profiling handler" typically listening on the `/profile` path. The profile handler will create a JFR recording that is sent as the reply to the HTTP request. The handler needs to configure a max duration (in seconds) for the recording and and a path to the `.jfc` configuration file. I made sure that only recording is allowed at a time to prevent too many requests to slow down the system too much. Testing: - [x] Tested locally on Linux x64 with various bots and configurations Thanks, Erik ------------- Commit messages: - bot: add profile handler Changes: https://git.openjdk.java.net/skara/pull/1164/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1164&range=00 Stats: 132 lines in 3 files changed: 131 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1164.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1164/head:pull/1164 PR: https://git.openjdk.java.net/skara/pull/1164 From ehelin at openjdk.java.net Mon May 24 14:12:08 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Mon, 24 May 2021 14:12:08 GMT Subject: RFR: bot: add version handler Message-ID: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> Hi all, please review this patch that adds a version handler, typically listening on the path `/version`. This simple handler just returns the version of the running bots, useful for scripting or dashboards. Typical configuration: { "http-server": { "/version": { "type": "version" } } } Example of usage: $ curl http://localhost:8080/version bd09ee70259733dc2e18577da6a36462c900dba3 Testing: - [x] Tested locally on Linux x64 Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1164 Commit messages: - bot: add version handler Changes: https://git.openjdk.java.net/skara/pull/1165/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1165&range=00 Stats: 62 lines in 4 files changed: 61 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1165.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1165/head:pull/1165 PR: https://git.openjdk.java.net/skara/pull/1165 From lgxbslgx at gmail.com Tue May 25 14:25:08 2021 From: lgxbslgx at gmail.com (Guoxiong Li) Date: Tue, 25 May 2021 22:25:08 +0800 Subject: The bot occasionally posts the same comments twice on Github Message-ID: Hi all, When we send an email to reply to a RFR email, the bot will post a comment on Github for us. But sometimes the bot may post the same comments twice. Please see this email[1]. We expect that the bot will post one comment to the corresponding PR[2]. But actually, the bot posted two same comments[3][4]. It is an intermittent issue. Sometimes, the bot behaves correctly. Even today, the bot can operate normally at one PR[5] but fails at another PR[6][7]. Is it a known issue? Anyway, it is good to fix it so that the redundant information won't be generated. [1] https://mail.openjdk.java.net/pipermail/compiler-dev/2021-May/016981.html [2] https://github.com/openjdk/jdk/pull/4157 [3] https://github.com/openjdk/jdk/pull/4157#issuecomment-846605316 [4] https://github.com/openjdk/jdk/pull/4157#issuecomment-846605322 [5] https://github.com/openjdk/jdk/pull/3976#issuecomment-847663710 [6] https://github.com/openjdk/jdk/pull/4167#issuecomment-847595516 [7] https://github.com/openjdk/jdk/pull/4167#issuecomment-847595538 Best Regards, -- Guoxiong From erik.joelsson at oracle.com Tue May 25 15:59:04 2021 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Tue, 25 May 2021 08:59:04 -0700 Subject: The bot occasionally posts the same comments twice on Github In-Reply-To: References: Message-ID: <06c0214d-39e7-2481-7a88-7d3b8a99adc9@oracle.com> Filed https://bugs.openjdk.java.net/browse/SKARA-1058 /Erik On 2021-05-25 07:25, Guoxiong Li wrote: > Hi all, > > When we send an email to reply to a RFR email, the bot will post a comment > on Github for us. > But sometimes the bot may post the same comments twice. > Please see this email[1]. We expect that the bot will post one comment to > the corresponding PR[2]. > But actually, the bot posted two same comments[3][4]. > > It is an intermittent issue. Sometimes, the bot behaves correctly. > Even today, the bot can operate normally at one PR[5] but fails at another > PR[6][7]. > > Is it a known issue? > Anyway, it is good to fix it so that the redundant information won't be > generated. > > [1] > https://mail.openjdk.java.net/pipermail/compiler-dev/2021-May/016981.html > [2]https://github.com/openjdk/jdk/pull/4157 > [3]https://github.com/openjdk/jdk/pull/4157#issuecomment-846605316 > [4]https://github.com/openjdk/jdk/pull/4157#issuecomment-846605322 > [5]https://github.com/openjdk/jdk/pull/3976#issuecomment-847663710 > [6]https://github.com/openjdk/jdk/pull/4167#issuecomment-847595516 > [7]https://github.com/openjdk/jdk/pull/4167#issuecomment-847595538 > > Best Regards, > -- Guoxiong From erikj at openjdk.java.net Tue May 25 20:26:31 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 25 May 2021 20:26:31 GMT Subject: RFR: Add metrics for RestRequestCache Message-ID: This change adds some metrics to better understand what the RestRequestCache is doing and to be able to monitor the consequences when I make changes to it. ------------- Commit messages: - Add metrics for RestRequestCache Changes: https://git.openjdk.java.net/skara/pull/1166/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1166&range=00 Stats: 8 lines in 1 file changed: 8 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1166.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1166/head:pull/1166 PR: https://git.openjdk.java.net/skara/pull/1166 From kcr at openjdk.java.net Tue May 25 20:38:53 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 25 May 2021 20:38:53 GMT Subject: RFR: Add metrics for RestRequestCache In-Reply-To: References: Message-ID: <0D9WtCpEWpP8jUP5maLgi3bRwK4vdCHCISvIDFc9Uj0=.f1015ed2-baa9-482e-b489-2491f1bc7968@github.com> On Tue, 25 May 2021 17:29:10 GMT, Erik Joelsson wrote: > This change adds some metrics to better understand what the RestRequestCache is doing and to be able to monitor the consequences when I make changes to it. Marked as reviewed by kcr (Committer). ------------- PR: https://git.openjdk.java.net/skara/pull/1166 From erikj at openjdk.java.net Tue May 25 23:02:39 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Tue, 25 May 2021 23:02:39 GMT Subject: RFR: 1052: Memory leak in RestRequestCache Message-ID: This patch adds a regularly scheduled cache eviction call to the RestRequestCache. ------------- Depends on: https://git.openjdk.java.net/skara/pull/1166 Commit messages: - Fixed remove loops - Run eviction on a separate, much longer intervall - SKARA-1052 Changes: https://git.openjdk.java.net/skara/pull/1167/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1167&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1052 Stats: 67 lines in 4 files changed: 51 ins; 3 del; 13 mod Patch: https://git.openjdk.java.net/skara/pull/1167.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1167/head:pull/1167 PR: https://git.openjdk.java.net/skara/pull/1167 From kcr at openjdk.java.net Tue May 25 23:12:44 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Tue, 25 May 2021 23:12:44 GMT Subject: RFR: 1052: Memory leak in RestRequestCache In-Reply-To: References: Message-ID: On Tue, 25 May 2021 22:59:02 GMT, Erik Joelsson wrote: > This patch adds a regularly scheduled cache eviction call to the RestRequestCache. Looks fine, although I raised a question about the default frequency. bot/src/main/java/org/openjdk/skara/bot/BotRunnerConfiguration.java line 328: > 326: Duration cacheEvictionInterval() { > 327: if (!config.contains("runner") || !config.get("runner").contains("cache_eviction_interval")) { > 328: var defaultValue = Duration.ofMinutes(5); Have you done any testing to see if a default interval of 5 minutes is the right frequency for cache evictions? Naively, it seems like it might be too often. Is there a performance impact? ------------- Marked as reviewed by kcr (Committer). PR: https://git.openjdk.java.net/skara/pull/1167 From ehelin at openjdk.java.net Wed May 26 07:41:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 26 May 2021 07:41:42 GMT Subject: RFR: Add metrics for RestRequestCache In-Reply-To: References: Message-ID: <2aizcX90kFS0rklXXqDVasJO7UXzGQAGQMlbd8jZjNY=.73869b8a-cd15-4937-8177-7c6d63206514@github.com> On Tue, 25 May 2021 17:29:10 GMT, Erik Joelsson wrote: > This change adds some metrics to better understand what the RestRequestCache is doing and to be able to monitor the consequences when I make changes to it. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1166 From ehelin at openjdk.java.net Wed May 26 07:45:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 26 May 2021 07:45:00 GMT Subject: RFR: 1052: Memory leak in RestRequestCache In-Reply-To: References: Message-ID: On Tue, 25 May 2021 22:59:02 GMT, Erik Joelsson wrote: > This patch adds a regularly scheduled cache eviction call to the RestRequestCache. Looks good ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1167 From ehelin at openjdk.java.net Wed May 26 07:45:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 26 May 2021 07:45:00 GMT Subject: RFR: 1052: Memory leak in RestRequestCache In-Reply-To: References: Message-ID: <1w3oZwnvtOZEi4LsaATz9Yp3XprH5AY9CoItOvVsTnM=.95071a05-a352-4ef4-83e1-881f3bdadb1c@github.com> On Tue, 25 May 2021 23:09:20 GMT, Kevin Rushforth wrote: >> This patch adds a regularly scheduled cache eviction call to the RestRequestCache. > > bot/src/main/java/org/openjdk/skara/bot/BotRunnerConfiguration.java line 328: > >> 326: Duration cacheEvictionInterval() { >> 327: if (!config.contains("runner") || !config.get("runner").contains("cache_eviction_interval")) { >> 328: var defaultValue = Duration.ofMinutes(5); > > Have you done any testing to see if a default interval of 5 minutes is the right frequency for cache evictions? Naively, it seems like it might be too often. Is there a performance impact? I agree with Kevin, I _think_ we could probably keep at least 60 minutes of cache, if not even more. Or I might have missed something ???? ------------- PR: https://git.openjdk.java.net/skara/pull/1167 From erikj at openjdk.java.net Wed May 26 12:49:03 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 12:49:03 GMT Subject: RFR: 1052: Memory leak in RestRequestCache In-Reply-To: <1w3oZwnvtOZEi4LsaATz9Yp3XprH5AY9CoItOvVsTnM=.95071a05-a352-4ef4-83e1-881f3bdadb1c@github.com> References: <1w3oZwnvtOZEi4LsaATz9Yp3XprH5AY9CoItOvVsTnM=.95071a05-a352-4ef4-83e1-881f3bdadb1c@github.com> Message-ID: On Wed, 26 May 2021 07:40:59 GMT, Erik Helin wrote: >> bot/src/main/java/org/openjdk/skara/bot/BotRunnerConfiguration.java line 328: >> >>> 326: Duration cacheEvictionInterval() { >>> 327: if (!config.contains("runner") || !config.get("runner").contains("cache_eviction_interval")) { >>> 328: var defaultValue = Duration.ofMinutes(5); >> >> Have you done any testing to see if a default interval of 5 minutes is the right frequency for cache evictions? Naively, it seems like it might be too often. Is there a performance impact? > > I agree with Kevin, I _think_ we could probably keep at least 60 minutes of cache, if not even more. Or I might have missed something ???? That is a good point. In my initial patch I used the scheduling frequency (which is what the watchdog uses) instead of this new configuration value, which is 10 seconds, and it worked fine on staging. I thought that was a bit excessive so I increased to a default of 5 mins, which matches the lowest "maxAge" in the cache. While we could certainly live with a longer interval here, 24h would still solve our problems, I don't think we have much to gain from increasing it longer than my suggested 5 mins. The nature of the bots is that they run pretty much non stop, using a lot of cpu. I can't see how running this little method will have any noticeable impact on performance, even if the cache has thousands or even millions of valid entries. It shouldn't take more than milliseconds on one of 8-32 threads (depending on bot runner config). If we start seeing problems, this value can always be changed in the future, or configured for any specific bot runner configuration. ------------- PR: https://git.openjdk.java.net/skara/pull/1167 From kcr at openjdk.java.net Wed May 26 12:57:38 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Wed, 26 May 2021 12:57:38 GMT Subject: RFR: 1052: Memory leak in RestRequestCache In-Reply-To: References: <1w3oZwnvtOZEi4LsaATz9Yp3XprH5AY9CoItOvVsTnM=.95071a05-a352-4ef4-83e1-881f3bdadb1c@github.com> Message-ID: <3XG3nj76r0XHkeJFVILf9EOcsBQY8lbj9JTZ8C4gFNE=.b689e7d7-c141-4e54-93cc-ee8a25ea69cc@github.com> On Wed, 26 May 2021 12:46:39 GMT, Erik Joelsson wrote: >> I agree with Kevin, I _think_ we could probably keep at least 60 minutes of cache, if not even more. Or I might have missed something ???? > > That is a good point. In my initial patch I used the scheduling frequency (which is what the watchdog uses) instead of this new configuration value, which is 10 seconds, and it worked fine on staging. I thought that was a bit excessive so I increased to a default of 5 mins, which matches the lowest "maxAge" in the cache. > > While we could certainly live with a longer interval here, 24h would still solve our problems, I don't think we have much to gain from increasing it longer than my suggested 5 mins. The nature of the bots is that they run pretty much non stop, using a lot of cpu. I can't see how running this little method will have any noticeable impact on performance, even if the cache has thousands or even millions of valid entries. It shouldn't take more than milliseconds on one of 8-32 threads (depending on bot runner config). > > If we start seeing problems, this value can always be changed in the future, or configured for any specific bot runner configuration. Seems OK to me. ------------- PR: https://git.openjdk.java.net/skara/pull/1167 From erikj at openjdk.java.net Wed May 26 13:10:02 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:10:02 GMT Subject: RFR: 1052: Memory leak in RestRequestCache In-Reply-To: <3XG3nj76r0XHkeJFVILf9EOcsBQY8lbj9JTZ8C4gFNE=.b689e7d7-c141-4e54-93cc-ee8a25ea69cc@github.com> References: <1w3oZwnvtOZEi4LsaATz9Yp3XprH5AY9CoItOvVsTnM=.95071a05-a352-4ef4-83e1-881f3bdadb1c@github.com> <3XG3nj76r0XHkeJFVILf9EOcsBQY8lbj9JTZ8C4gFNE=.b689e7d7-c141-4e54-93cc-ee8a25ea69cc@github.com> Message-ID: On Wed, 26 May 2021 12:55:24 GMT, Kevin Rushforth wrote: >> That is a good point. In my initial patch I used the scheduling frequency (which is what the watchdog uses) instead of this new configuration value, which is 10 seconds, and it worked fine on staging. I thought that was a bit excessive so I increased to a default of 5 mins, which matches the lowest "maxAge" in the cache. >> >> While we could certainly live with a longer interval here, 24h would still solve our problems, I don't think we have much to gain from increasing it longer than my suggested 5 mins. The nature of the bots is that they run pretty much non stop, using a lot of cpu. I can't see how running this little method will have any noticeable impact on performance, even if the cache has thousands or even millions of valid entries. It shouldn't take more than milliseconds on one of 8-32 threads (depending on bot runner config). >> >> If we start seeing problems, this value can always be changed in the future, or configured for any specific bot runner configuration. > > Seems OK to me. Also just to clarify as I realized there was a misunderstanding in offline discussion. This patch is not changing the functional behavior of the cache in any way. The entries that are being removed are just those older than "maxAge", which were already disqualified in the send method. I have also verified the behavior in staging over night and the metrics show that we have the same amount of cache hits/min with the patch as before. ------------- PR: https://git.openjdk.java.net/skara/pull/1167 From erikj at openjdk.java.net Wed May 26 13:39:26 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:39:26 GMT Subject: Integrated: Add metrics for RestRequestCache In-Reply-To: References: Message-ID: <5TspYdemOLxdFh7-N_ifchqgingesbKfLGCVlKlHNcg=.78c0b0bb-b9ff-4d7a-a689-189130381efe@github.com> On Tue, 25 May 2021 17:29:10 GMT, Erik Joelsson wrote: > This change adds some metrics to better understand what the RestRequestCache is doing and to be able to monitor the consequences when I make changes to it. This pull request has now been integrated. Changeset: d5e31d21 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/d5e31d21aa560ececf652c598a0c7c4e852a2fcd Stats: 8 lines in 1 file changed: 8 ins; 0 del; 0 mod Add metrics for RestRequestCache Reviewed-by: kcr, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1166 From erikj at openjdk.java.net Wed May 26 13:40:35 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:40:35 GMT Subject: RFR: 1052: Memory leak in RestRequestCache [v2] In-Reply-To: References: Message-ID: > This patch adds a regularly scheduled cache eviction call to the RestRequestCache. Erik Joelsson has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1167/files - new: https://git.openjdk.java.net/skara/pull/1167/files/3a1049a1..3a1049a1 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1167&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1167&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1167.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1167/head:pull/1167 PR: https://git.openjdk.java.net/skara/pull/1167 From "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net Wed May 26 13:40:35 2021 From: "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net (openjdk-notifier [bot]) Date: Wed, 26 May 2021 13:40:35 GMT Subject: RFR: 1052: Memory leak in RestRequestCache In-Reply-To: References: Message-ID: On Tue, 25 May 2021 22:59:02 GMT, Erik Joelsson wrote: > This patch adds a regularly scheduled cache eviction call to the RestRequestCache. The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout SKARA-1052-add-metrics git fetch https://git.openjdk.java.net/skara master git merge FETCH_HEAD # if there are conflicts, follow the instructions given by git merge git commit -m "Merge master" git push ------------- PR: https://git.openjdk.java.net/skara/pull/1167 From ehelin at openjdk.java.net Wed May 26 13:47:21 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 26 May 2021 13:47:21 GMT Subject: RFR: bots: add workItemName method Message-ID: Hi all, please review this patch that adds the `WorkItem.workItemName` method. Some bots have several different kinds of work items and it can be useful for monitoring systems to distinguish these work items. I opted for the `workItemName` instead of just `name` since the `Bot` interface already has a `name` method and a number of classes implement both the `Bot` and `WorkItem` interfaces (common for smaller bots). Thanks, Erik ------------- Commit messages: - bots: add workItemName method Changes: https://git.openjdk.java.net/skara/pull/1168/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1168&range=00 Stats: 150 lines in 30 files changed: 150 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1168.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1168/head:pull/1168 PR: https://git.openjdk.java.net/skara/pull/1168 From erikj at openjdk.java.net Wed May 26 13:47:21 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:47:21 GMT Subject: RFR: bots: add workItemName method In-Reply-To: References: Message-ID: <8RlXu1wr9_vRE6mZ8EMPFfMTymiiZYXWL_IWvf6Y8OM=.b106680e-8935-4e3a-9d9f-bca28c2b4ee1@github.com> On Wed, 26 May 2021 13:42:07 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `WorkItem.workItemName` method. Some bots have several different kinds of work items and it can be useful for monitoring systems to distinguish these work items. I opted for the `workItemName` instead of just `name` since the `Bot` interface already has a `name` method and a number of classes implement both the `Bot` and `WorkItem` interfaces (common for smaller bots). > > Thanks, > Erik Looks good! ------------- Marked as reviewed by erikj (Lead). PR: https://git.openjdk.java.net/skara/pull/1168 From ehelin at openjdk.java.net Wed May 26 13:48:16 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 26 May 2021 13:48:16 GMT Subject: RFR: bot: add work item name to counters Message-ID: Hi all, please review this patch that adds a new label to the counters in `BotRunner` - `work-item`. The `work-item` label shows the name of the work item (in addition to the bot name which is already present in the `bot` label). This is useful for metrics from larger bots that consists of multiple work items. Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1168 Commit messages: - bot: add work item name to counters Changes: https://git.openjdk.java.net/skara/pull/1169/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1169&range=00 Stats: 9 lines in 1 file changed: 0 ins; 0 del; 9 mod Patch: https://git.openjdk.java.net/skara/pull/1169.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1169/head:pull/1169 PR: https://git.openjdk.java.net/skara/pull/1169 From erikj at openjdk.java.net Wed May 26 13:48:16 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:48:16 GMT Subject: RFR: bot: add work item name to counters In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:44:10 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a new label to the counters in `BotRunner` - `work-item`. The `work-item` label shows the name of the work item (in addition to the bot name which is already present in the `bot` label). This is useful for metrics from larger bots that consists of multiple work items. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by erikj (Lead). PR: https://git.openjdk.java.net/skara/pull/1169 From erikj at openjdk.java.net Wed May 26 13:48:36 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:48:36 GMT Subject: Integrated: 1052: Memory leak in RestRequestCache In-Reply-To: References: Message-ID: On Tue, 25 May 2021 22:59:02 GMT, Erik Joelsson wrote: > This patch adds a regularly scheduled cache eviction call to the RestRequestCache. This pull request has now been integrated. Changeset: ca8d1c3b Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/ca8d1c3b817029fd083c2ff5aef0f827b96a734f Stats: 67 lines in 4 files changed: 51 ins; 3 del; 13 mod 1052: Memory leak in RestRequestCache Reviewed-by: kcr, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1167 From ehelin at openjdk.java.net Wed May 26 13:49:26 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 26 May 2021 13:49:26 GMT Subject: RFR: bot: add exception type to counter Message-ID: Hi all, please review this small patch that adds the `exception` label to the `skara_runner_exceptions` counter. This is useful to be able to query for different kinds of exceptions when viewing this metric. Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1169 Commit messages: - bot: add exception type to counter Changes: https://git.openjdk.java.net/skara/pull/1170/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1170&range=00 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod Patch: https://git.openjdk.java.net/skara/pull/1170.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1170/head:pull/1170 PR: https://git.openjdk.java.net/skara/pull/1170 From erikj at openjdk.java.net Wed May 26 13:49:26 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:49:26 GMT Subject: RFR: bot: add exception type to counter In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:45:58 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `exception` label to the `skara_runner_exceptions` counter. This is useful to be able to query for different kinds of exceptions when viewing this metric. > > Thanks, > Erik Looks good! ------------- Marked as reviewed by erikj (Lead). PR: https://git.openjdk.java.net/skara/pull/1170 From ehelin at openjdk.java.net Wed May 26 13:54:01 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Wed, 26 May 2021 13:54:01 GMT Subject: RFR: bot: add performance metrics for work items Message-ID: Hi all, please review this patch that adds runtime performance metrics for work items. I have added three new gauges: - `skara_runner_cpu_time` - `skara_runner_user_time` - `skara_runner_allocated_bytes` All three are per work item and make use of the `ThreadMXBean` to set the gauges. We can use the methods in `ThreadMXBean` because the `Runnable` that is running on a thread in the thread pool cannot be preempted or moved to another thread, i.e. it will have the same "carrier" thread for its whole execution. Testing: - [x] Manual testing on Linux x64 using the mirror bot Thanks, Erik ------------- Depends on: https://git.openjdk.java.net/skara/pull/1170 Commit messages: - bot: add performance metrics for work items Changes: https://git.openjdk.java.net/skara/pull/1171/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1171&range=00 Stats: 96 lines in 2 files changed: 95 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1171.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1171/head:pull/1171 PR: https://git.openjdk.java.net/skara/pull/1171 From erikj at openjdk.java.net Wed May 26 13:58:41 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 13:58:41 GMT Subject: RFR: bot: add performance metrics for work items In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:51:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds runtime performance metrics for work items. I have added three new gauges: > > - `skara_runner_cpu_time` > - `skara_runner_user_time` > - `skara_runner_allocated_bytes` > > All three are per work item and make use of the `ThreadMXBean` to set the gauges. We can use the methods in `ThreadMXBean` because the `Runnable` that is running on a thread in the thread pool cannot be preempted or moved to another thread, i.e. it will have the same "carrier" thread for its whole execution. > > Testing: > - [x] Manual testing on Linux x64 using the mirror bot > > Thanks, > Erik This looks pretty cool! Marked as reviewed by erikj (Lead). ------------- PR: https://git.openjdk.java.net/skara/pull/1171 From erikj at openjdk.java.net Wed May 26 20:18:34 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 20:18:34 GMT Subject: RFR: 1053: Github check in conclusion "stale" not handled Message-ID: This patch adds handling of the "stale" github check result. A stale result does not have a completed_at time, so we need to handle that this field can be null. I tried to look through the code to see if there were any places where we would need to react to this new result, but could only find one that seemed relevant. ------------- Commit messages: - SKARA-1053 Changes: https://git.openjdk.java.net/skara/pull/1172/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1172&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1053 Stats: 13 lines in 4 files changed: 11 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1172.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1172/head:pull/1172 PR: https://git.openjdk.java.net/skara/pull/1172 From erikj at openjdk.java.net Wed May 26 23:17:41 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 23:17:41 GMT Subject: RFR: Update readme Message-ID: This patch updates the readme to clarify that you need to set JAVA_HOME when building Skara on a platform other than Linux, Windows and Macos x64. ------------- Commit messages: - Update readme Changes: https://git.openjdk.java.net/skara/pull/1173/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1173&range=00 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1173.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1173/head:pull/1173 PR: https://git.openjdk.java.net/skara/pull/1173 From kcr at openjdk.java.net Wed May 26 23:34:41 2021 From: kcr at openjdk.java.net (Kevin Rushforth) Date: Wed, 26 May 2021 23:34:41 GMT Subject: RFR: Update readme In-Reply-To: References: Message-ID: On Wed, 26 May 2021 23:14:31 GMT, Erik Joelsson wrote: > This patch updates the readme to clarify that you need to set JAVA_HOME when building Skara on a platform other than Linux, Windows and Macos x64. Marked as reviewed by kcr (Committer). ------------- PR: https://git.openjdk.java.net/skara/pull/1173 From iris at openjdk.java.net Wed May 26 23:37:58 2021 From: iris at openjdk.java.net (Iris Clark) Date: Wed, 26 May 2021 23:37:58 GMT Subject: RFR: Update readme In-Reply-To: References: Message-ID: <08HHCTDLCQwSQa97V7imxFTM_UWNWqC-UVLjRgIrPyQ=.5ecab4a3-78b5-4787-b3d7-ff544b06928b@github.com> On Wed, 26 May 2021 23:14:31 GMT, Erik Joelsson wrote: > This patch updates the readme to clarify that you need to set JAVA_HOME when building Skara on a platform other than Linux, Windows and Macos x64. Marked as reviewed by iris (no project role). ------------- PR: https://git.openjdk.java.net/skara/pull/1173 From erikj at openjdk.java.net Wed May 26 23:46:36 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Wed, 26 May 2021 23:46:36 GMT Subject: RFR: 1061: The skara update command is broken for platforms without downloaded JDK Message-ID: This patch changes the CLI launcher scripts to no longer export JAVA_HOME. This is to prevent this exported variable from interfering with the "git skara update" command. The update command needs to be able to run Gradle. Gradle cannot run with the JAVA_HOME exported from the Skara CLI scripts. Whatever JAVA_HOME the user has needs to survive through to the Gradle invocation. I'm not sure why JAVA_HOME was set here. It seems to have been around for a long time. I'm assuming it just happened to be written that way, but if anyone can think of a reason, that would be good. I'm running with this patch myself right now to try to catch any potential problems. ------------- Commit messages: - Stop setting JAVA_HOME in cli launchers Changes: https://git.openjdk.java.net/skara/pull/1174/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1174&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1061 Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1174.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1174/head:pull/1174 PR: https://git.openjdk.java.net/skara/pull/1174 From ehelin at openjdk.java.net Thu May 27 07:59:32 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 27 May 2021 07:59:32 GMT Subject: RFR: Update readme In-Reply-To: References: Message-ID: On Wed, 26 May 2021 23:14:31 GMT, Erik Joelsson wrote: > This patch updates the readme to clarify that you need to set JAVA_HOME when building Skara on a platform other than Linux, Windows and Macos x64. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1173 From ehelin at openjdk.java.net Thu May 27 08:00:00 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 27 May 2021 08:00:00 GMT Subject: RFR: 1061: The skara update command is broken for platforms without downloaded JDK In-Reply-To: References: Message-ID: <8yYpKNXy9LU2X7jlm-TOCkSRqRY6jJiJZJuiFpZm_PM=.5ed0b1a4-ead9-49de-b94a-dc760edc2960@github.com> On Wed, 26 May 2021 23:43:09 GMT, Erik Joelsson wrote: > This patch changes the CLI launcher scripts to no longer export JAVA_HOME. This is to prevent this exported variable from interfering with the "git skara update" command. The update command needs to be able to run Gradle. Gradle cannot run with the JAVA_HOME exported from the Skara CLI scripts. Whatever JAVA_HOME the user has needs to survive through to the Gradle invocation. > > I'm not sure why JAVA_HOME was set here. It seems to have been around for a long time. I'm assuming it just happened to be written that way, but if anyone can think of a reason, that would be good. I'm running with this patch myself right now to try to catch any potential problems. Looks good! ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1174 From ehelin at openjdk.java.net Thu May 27 09:09:50 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 27 May 2021 09:09:50 GMT Subject: RFR: 1053: Github check in conclusion "stale" not handled In-Reply-To: References: Message-ID: On Wed, 26 May 2021 20:15:15 GMT, Erik Joelsson wrote: > This patch adds handling of the "stale" github check result. A stale result does not have a completed_at time, so we need to handle that this field can be null. > > I tried to look through the code to see if there were any places where we would need to react to this new result, but could only find one that seemed relevant. Looks good! forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java line 410: > 408: if (completed) { > 409: var conclusion = c.get("conclusion").asString(); > 410: String completedAtString = c.get("completed_at").asString(); Suggestion: var completedAtString = c.get("completed_at").asString(); ------------- Marked as reviewed by ehelin (Reviewer). PR: https://git.openjdk.java.net/skara/pull/1172 From erikj at openjdk.java.net Thu May 27 12:58:46 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 27 May 2021 12:58:46 GMT Subject: RFR: 1053: Github check in conclusion "stale" not handled [v2] In-Reply-To: References: Message-ID: > This patch adds handling of the "stale" github check result. A stale result does not have a completed_at time, so we need to handle that this field can be null. > > I tried to look through the code to see if there were any places where we would need to react to this new result, but could only find one that seemed relevant. Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision: Update forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java Co-authored-by: Erik Duveblad ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1172/files - new: https://git.openjdk.java.net/skara/pull/1172/files/907a2c8a..dca18923 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1172&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1172&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1172.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1172/head:pull/1172 PR: https://git.openjdk.java.net/skara/pull/1172 From erikj at openjdk.java.net Thu May 27 12:58:52 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 27 May 2021 12:58:52 GMT Subject: Integrated: 1061: The skara update command is broken for platforms without downloaded JDK In-Reply-To: References: Message-ID: On Wed, 26 May 2021 23:43:09 GMT, Erik Joelsson wrote: > This patch changes the CLI launcher scripts to no longer export JAVA_HOME. This is to prevent this exported variable from interfering with the "git skara update" command. The update command needs to be able to run Gradle. Gradle cannot run with the JAVA_HOME exported from the Skara CLI scripts. Whatever JAVA_HOME the user has needs to survive through to the Gradle invocation. > > I'm not sure why JAVA_HOME was set here. It seems to have been around for a long time. I'm assuming it just happened to be written that way, but if anyone can think of a reason, that would be good. I'm running with this patch myself right now to try to catch any potential problems. This pull request has now been integrated. Changeset: b54fecb4 Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/b54fecb43c30eeab4cc1a8c663ad646056a9006c Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod 1061: The skara update command is broken for platforms without downloaded JDK Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1174 From erikj at openjdk.java.net Thu May 27 12:58:47 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 27 May 2021 12:58:47 GMT Subject: Integrated: 1053: Github check in conclusion "stale" not handled In-Reply-To: References: Message-ID: On Wed, 26 May 2021 20:15:15 GMT, Erik Joelsson wrote: > This patch adds handling of the "stale" github check result. A stale result does not have a completed_at time, so we need to handle that this field can be null. > > I tried to look through the code to see if there were any places where we would need to react to this new result, but could only find one that seemed relevant. This pull request has now been integrated. Changeset: 2eb3dabf Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/2eb3dabfb1cde7ae3d48d8168038135236a47e13 Stats: 13 lines in 4 files changed: 11 ins; 0 del; 2 mod 1053: Github check in conclusion "stale" not handled Reviewed-by: ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1172 From erikj at openjdk.java.net Thu May 27 12:59:05 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 27 May 2021 12:59:05 GMT Subject: Integrated: Update readme In-Reply-To: References: Message-ID: On Wed, 26 May 2021 23:14:31 GMT, Erik Joelsson wrote: > This patch updates the readme to clarify that you need to set JAVA_HOME when building Skara on a platform other than Linux, Windows and Macos x64. This pull request has now been integrated. Changeset: 2863b96c Author: Erik Joelsson URL: https://git.openjdk.java.net/skara/commit/2863b96cb1a6919cd59c52d4ff772cde57f37a21 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Update readme Reviewed-by: kcr, iris, ehelin ------------- PR: https://git.openjdk.java.net/skara/pull/1173 From ehelin at openjdk.java.net Thu May 27 14:43:24 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Thu, 27 May 2021 14:43:24 GMT Subject: RFR: metrics: add process metrics Message-ID: Hi all, please review this patch that adds the [Prometheus recommended](https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics) `process_*` metrics. I've tested the implementation manually on a Linux x64 machine and opted to start by only implementing support for all metrics on Linux hosts. Thanks, Erik ------------- Commit messages: - metrics: add process metrics Changes: https://git.openjdk.java.net/skara/pull/1175/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1175&range=00 Stats: 116 lines in 5 files changed: 89 ins; 0 del; 27 mod Patch: https://git.openjdk.java.net/skara/pull/1175.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1175/head:pull/1175 PR: https://git.openjdk.java.net/skara/pull/1175 From erikj at openjdk.java.net Thu May 27 17:03:38 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Thu, 27 May 2021 17:03:38 GMT Subject: RFR: metrics: add process metrics In-Reply-To: References: Message-ID: <_UPiGVy8MHUcXpiFmAqyaT7JmatpD9KPLKpgnqXnsGs=.70998ffe-820d-45c2-a99c-16b971bc7087@github.com> On Thu, 27 May 2021 14:40:24 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the [Prometheus recommended](https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics) `process_*` metrics. I've tested the implementation manually on a Linux x64 machine and opted to start by only implementing support for all metrics on Linux hosts. > > Thanks, > Erik Looks good. ------------- Marked as reviewed by erikj (Lead). PR: https://git.openjdk.java.net/skara/pull/1175 From ehelin at openjdk.java.net Fri May 28 07:55:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 07:55:15 GMT Subject: Integrated: metrics: add process metrics In-Reply-To: References: Message-ID: On Thu, 27 May 2021 14:40:24 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the [Prometheus recommended](https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics) `process_*` metrics. I've tested the implementation manually on a Linux x64 machine and opted to start by only implementing support for all metrics on Linux hosts. > > Thanks, > Erik This pull request has now been integrated. Changeset: f3489845 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/f3489845a998374a64a34ffa1d119a317a6b4cd6 Stats: 116 lines in 5 files changed: 89 ins; 0 del; 27 mod metrics: add process metrics Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1175 From ehelin at openjdk.java.net Fri May 28 08:04:11 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 08:04:11 GMT Subject: Integrated: bots: add workItemName method In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:42:07 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds the `WorkItem.workItemName` method. Some bots have several different kinds of work items and it can be useful for monitoring systems to distinguish these work items. I opted for the `workItemName` instead of just `name` since the `Bot` interface already has a `name` method and a number of classes implement both the `Bot` and `WorkItem` interfaces (common for smaller bots). > > Thanks, > Erik This pull request has now been integrated. Changeset: 2907f199 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2907f199f2825fff021bf52b01544b831a680531 Stats: 150 lines in 30 files changed: 150 ins; 0 del; 0 mod bots: add workItemName method Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1168 From ehelin at openjdk.java.net Fri May 28 08:05:13 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 08:05:13 GMT Subject: RFR: bot: add work item name to counters [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds a new label to the counters in `BotRunner` - `work-item`. The `work-item` label shows the name of the work item (in addition to the bot name which is already present in the `bot` label). This is useful for metrics from larger bots that consists of multiple work items. > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1169/files - new: https://git.openjdk.java.net/skara/pull/1169/files/2ff20b2b..2ff20b2b Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1169&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1169&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1169.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1169/head:pull/1169 PR: https://git.openjdk.java.net/skara/pull/1169 From "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net Fri May 28 08:05:14 2021 From: "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net (openjdk-notifier [bot]) Date: Fri, 28 May 2021 08:05:14 GMT Subject: RFR: bot: add work item name to counters In-Reply-To: References: Message-ID: <8KLzR1FnqKPpPhQPj6Naput9HwFkgHr_btG82mjf5m4=.be966405-44cc-4c0a-b1ed-d61d90818606@github.com> On Wed, 26 May 2021 13:44:10 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a new label to the counters in `BotRunner` - `work-item`. The `work-item` label shows the name of the work item (in addition to the bot name which is already present in the `bot` label). This is useful for metrics from larger bots that consists of multiple work items. > > Thanks, > Erik The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout work-item-name git fetch https://git.openjdk.java.net/skara master git merge FETCH_HEAD # if there are conflicts, follow the instructions given by git merge git commit -m "Merge master" git push ------------- PR: https://git.openjdk.java.net/skara/pull/1169 From ehelin at openjdk.java.net Fri May 28 08:15:40 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 08:15:40 GMT Subject: Integrated: bot: add work item name to counters In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:44:10 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a new label to the counters in `BotRunner` - `work-item`. The `work-item` label shows the name of the work item (in addition to the bot name which is already present in the `bot` label). This is useful for metrics from larger bots that consists of multiple work items. > > Thanks, > Erik This pull request has now been integrated. Changeset: 75a72f52 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/75a72f52bbbf9af2bc37e108559de7c5a77c0a43 Stats: 9 lines in 1 file changed: 0 ins; 0 del; 9 mod bot: add work item name to counters Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1169 From ehelin at openjdk.java.net Fri May 28 08:16:15 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 08:16:15 GMT Subject: RFR: bot: add exception type to counter [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this small patch that adds the `exception` label to the `skara_runner_exceptions` counter. This is useful to be able to query for different kinds of exceptions when viewing this metric. > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1170/files - new: https://git.openjdk.java.net/skara/pull/1170/files/e217a7cd..e217a7cd Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1170&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1170&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1170.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1170/head:pull/1170 PR: https://git.openjdk.java.net/skara/pull/1170 From "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net Fri May 28 08:16:15 2021 From: "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net (openjdk-notifier [bot]) Date: Fri, 28 May 2021 08:16:15 GMT Subject: RFR: bot: add exception type to counter In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:45:58 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `exception` label to the `skara_runner_exceptions` counter. This is useful to be able to query for different kinds of exceptions when viewing this metric. > > Thanks, > Erik The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout counters-work-item-name git fetch https://git.openjdk.java.net/skara master git merge FETCH_HEAD # if there are conflicts, follow the instructions given by git merge git commit -m "Merge master" git push ------------- PR: https://git.openjdk.java.net/skara/pull/1170 From ehelin at openjdk.java.net Fri May 28 08:21:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 08:21:49 GMT Subject: Integrated: bot: add exception type to counter In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:45:58 GMT, Erik Helin wrote: > Hi all, > > please review this small patch that adds the `exception` label to the `skara_runner_exceptions` counter. This is useful to be able to query for different kinds of exceptions when viewing this metric. > > Thanks, > Erik This pull request has now been integrated. Changeset: 2d93b1d3 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/2d93b1d3423850117d01cde65a2c34ce19ce8628 Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod bot: add exception type to counter Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1170 From ehelin at openjdk.java.net Fri May 28 08:22:52 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 08:22:52 GMT Subject: RFR: bot: add performance metrics for work items [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds runtime performance metrics for work items. I have added three new gauges: > > - `skara_runner_cpu_time` > - `skara_runner_user_time` > - `skara_runner_allocated_bytes` > > All three are per work item and make use of the `ThreadMXBean` to set the gauges. We can use the methods in `ThreadMXBean` because the `Runnable` that is running on a thread in the thread pool cannot be preempted or moved to another thread, i.e. it will have the same "carrier" thread for its whole execution. > > Testing: > - [x] Manual testing on Linux x64 using the mirror bot > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1171/files - new: https://git.openjdk.java.net/skara/pull/1171/files/497d1bca..497d1bca Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1171&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1171&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1171.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1171/head:pull/1171 PR: https://git.openjdk.java.net/skara/pull/1171 From "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net Fri May 28 08:22:52 2021 From: "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net (openjdk-notifier [bot]) Date: Fri, 28 May 2021 08:22:52 GMT Subject: RFR: bot: add performance metrics for work items In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:51:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds runtime performance metrics for work items. I have added three new gauges: > > - `skara_runner_cpu_time` > - `skara_runner_user_time` > - `skara_runner_allocated_bytes` > > All three are per work item and make use of the `ThreadMXBean` to set the gauges. We can use the methods in `ThreadMXBean` because the `Runnable` that is running on a thread in the thread pool cannot be preempted or moved to another thread, i.e. it will have the same "carrier" thread for its whole execution. > > Testing: > - [x] Manual testing on Linux x64 using the mirror bot > > Thanks, > Erik The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout counter-exception-type git fetch https://git.openjdk.java.net/skara master git merge FETCH_HEAD # if there are conflicts, follow the instructions given by git merge git commit -m "Merge master" git push ------------- PR: https://git.openjdk.java.net/skara/pull/1171 From ehelin at openjdk.java.net Fri May 28 08:44:31 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 08:44:31 GMT Subject: RFR: bot: add performance metrics for work items [v3] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds runtime performance metrics for work items. I have added three new gauges: > > - `skara_runner_cpu_time` > - `skara_runner_user_time` > - `skara_runner_allocated_bytes` > > All three are per work item and make use of the `ThreadMXBean` to set the gauges. We can use the methods in `ThreadMXBean` because the `Runnable` that is running on a thread in the thread pool cannot be preempted or moved to another thread, i.e. it will have the same "carrier" thread for its whole execution. > > Testing: > - [x] Manual testing on Linux x64 using the mirror bot > > Thanks, > Erik Erik Helin has updated the pull request incrementally with one additional commit since the last revision: Fix conversion to seconds ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1171/files - new: https://git.openjdk.java.net/skara/pull/1171/files/497d1bca..bcd615d2 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1171&range=02 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1171&range=01-02 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1171.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1171/head:pull/1171 PR: https://git.openjdk.java.net/skara/pull/1171 From ehelin at openjdk.java.net Fri May 28 09:30:28 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 09:30:28 GMT Subject: Integrated: bot: add performance metrics for work items In-Reply-To: References: Message-ID: On Wed, 26 May 2021 13:51:02 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds runtime performance metrics for work items. I have added three new gauges: > > - `skara_runner_cpu_time` > - `skara_runner_user_time` > - `skara_runner_allocated_bytes` > > All three are per work item and make use of the `ThreadMXBean` to set the gauges. We can use the methods in `ThreadMXBean` because the `Runnable` that is running on a thread in the thread pool cannot be preempted or moved to another thread, i.e. it will have the same "carrier" thread for its whole execution. > > Testing: > - [x] Manual testing on Linux x64 using the mirror bot > > Thanks, > Erik This pull request has now been integrated. Changeset: 00ada5d5 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/00ada5d5f0e0e2a7f7d88a962c627db6d9095174 Stats: 96 lines in 2 files changed: 95 ins; 0 del; 1 mod bot: add performance metrics for work items Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1171 From ehelin at openjdk.java.net Fri May 28 11:25:55 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 11:25:55 GMT Subject: RFR: bot: add profile handler [v2] In-Reply-To: References: Message-ID: > Hi all, > > please review this patch that adds a "profiling handler" typically listening on the `/profile` path. The profile handler will create a JFR recording that is sent as the reply to the HTTP request. The handler needs to configure a max duration (in seconds) for the recording and and a path to the `.jfc` configuration file. I made sure that only recording is allowed at a time to prevent too many requests to slow down the system too much. > > Testing: > - [x] Tested locally on Linux x64 with various bots and configurations > > Thanks, > Erik Erik Helin has updated the pull request incrementally with two additional commits since the last revision: - Fixup - Require auth header ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1164/files - new: https://git.openjdk.java.net/skara/pull/1164/files/bd09ee70..2fabd94e Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1164&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1164&range=00-01 Stats: 26 lines in 1 file changed: 24 ins; 0 del; 2 mod Patch: https://git.openjdk.java.net/skara/pull/1164.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1164/head:pull/1164 PR: https://git.openjdk.java.net/skara/pull/1164 From erikj at openjdk.java.net Fri May 28 12:41:25 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 28 May 2021 12:41:25 GMT Subject: RFR: bot: add profile handler [v2] In-Reply-To: References: Message-ID: On Fri, 28 May 2021 11:25:55 GMT, Erik Helin wrote: >> Hi all, >> >> please review this patch that adds a "profiling handler" typically listening on the `/profile` path. The profile handler will create a JFR recording that is sent as the reply to the HTTP request. The handler needs to configure a max duration (in seconds) for the recording and and a path to the `.jfc` configuration file. I made sure that only recording is allowed at a time to prevent too many requests to slow down the system too much. >> >> Testing: >> - [x] Tested locally on Linux x64 with various bots and configurations >> >> Thanks, >> Erik > > Erik Helin has updated the pull request incrementally with two additional commits since the last revision: > > - Fixup > - Require auth header Marked as reviewed by erikj (Lead). ------------- PR: https://git.openjdk.java.net/skara/pull/1164 From erikj at openjdk.java.net Fri May 28 18:16:22 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 28 May 2021 18:16:22 GMT Subject: RFR: bot: add version handler In-Reply-To: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> References: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> Message-ID: On Mon, 24 May 2021 14:08:45 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a version handler, typically listening on the path `/version`. This simple handler just returns the version of the running bots, useful for scripting or dashboards. Typical configuration: > > > { > "http-server": { > "/version": { > "type": "version" > } > } > } > > > Example of usage: > > > $ curl http://localhost:8080/version > bd09ee70259733dc2e18577da6a36462c900dba3 > > > Testing: > - [x] Tested locally on Linux x64 > > Thanks, > Erik Marked as reviewed by erikj (Lead). ------------- PR: https://git.openjdk.java.net/skara/pull/1165 From ehelin at openjdk.java.net Fri May 28 18:18:42 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 18:18:42 GMT Subject: Integrated: bot: add profile handler In-Reply-To: References: Message-ID: On Mon, 24 May 2021 13:49:08 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a "profiling handler" typically listening on the `/profile` path. The profile handler will create a JFR recording that is sent as the reply to the HTTP request. The handler needs to configure a max duration (in seconds) for the recording and and a path to the `.jfc` configuration file. I made sure that only recording is allowed at a time to prevent too many requests to slow down the system too much. > > Testing: > - [x] Tested locally on Linux x64 with various bots and configurations > > Thanks, > Erik This pull request has now been integrated. Changeset: 92bf2dcc Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/92bf2dcc446fdc1c1c3808e40a49123e0f1e8f94 Stats: 156 lines in 3 files changed: 155 ins; 0 del; 1 mod bot: add profile handler Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1164 From ehelin at openjdk.java.net Fri May 28 18:20:49 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 18:20:49 GMT Subject: RFR: bot: add version handler [v2] In-Reply-To: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> References: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> Message-ID: > Hi all, > > please review this patch that adds a version handler, typically listening on the path `/version`. This simple handler just returns the version of the running bots, useful for scripting or dashboards. Typical configuration: > > > { > "http-server": { > "/version": { > "type": "version" > } > } > } > > > Example of usage: > > > $ curl http://localhost:8080/version > bd09ee70259733dc2e18577da6a36462c900dba3 > > > Testing: > - [x] Tested locally on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. ------------- Changes: - all: https://git.openjdk.java.net/skara/pull/1165/files - new: https://git.openjdk.java.net/skara/pull/1165/files/ead619b2..ead619b2 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1165&range=01 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1165&range=00-01 Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/skara/pull/1165.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1165/head:pull/1165 PR: https://git.openjdk.java.net/skara/pull/1165 From "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net Fri May 28 18:20:50 2021 From: "github.com+73116608+openjdk-notifier[bot]" at openjdk.java.net (openjdk-notifier [bot]) Date: Fri, 28 May 2021 18:20:50 GMT Subject: RFR: bot: add version handler In-Reply-To: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> References: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> Message-ID: <3n98l9eKI1FGtz6GWFkf_QRWGDJg2lCIlq5G1AEoo8M=.ff93f43c-5149-45b4-b383-5bd2f2619014@github.com> On Mon, 24 May 2021 14:08:45 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a version handler, typically listening on the path `/version`. This simple handler just returns the version of the running bots, useful for scripting or dashboards. Typical configuration: > > > { > "http-server": { > "/version": { > "type": "version" > } > } > } > > > Example of usage: > > > $ curl http://localhost:8080/version > bd09ee70259733dc2e18577da6a36462c900dba3 > > > Testing: > - [x] Tested locally on Linux x64 > > Thanks, > Erik The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout profile-handler git fetch https://git.openjdk.java.net/skara master git merge FETCH_HEAD # if there are conflicts, follow the instructions given by git merge git commit -m "Merge master" git push ------------- PR: https://git.openjdk.java.net/skara/pull/1165 From ehelin at openjdk.java.net Fri May 28 18:32:22 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 18:32:22 GMT Subject: Integrated: bot: add version handler In-Reply-To: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> References: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> Message-ID: On Mon, 24 May 2021 14:08:45 GMT, Erik Helin wrote: > Hi all, > > please review this patch that adds a version handler, typically listening on the path `/version`. This simple handler just returns the version of the running bots, useful for scripting or dashboards. Typical configuration: > > > { > "http-server": { > "/version": { > "type": "version" > } > } > } > > > Example of usage: > > > $ curl http://localhost:8080/version > bd09ee70259733dc2e18577da6a36462c900dba3 > > > Testing: > - [x] Tested locally on Linux x64 > > Thanks, > Erik This pull request has now been integrated. Changeset: a1664324 Author: Erik Helin URL: https://git.openjdk.java.net/skara/commit/a1664324b80b8cdbe000089ce46ac9dff978fd69 Stats: 62 lines in 4 files changed: 61 ins; 0 del; 1 mod bot: add version handler Reviewed-by: erikj ------------- PR: https://git.openjdk.java.net/skara/pull/1165 From ehelin at openjdk.java.net Fri May 28 18:32:21 2021 From: ehelin at openjdk.java.net (Erik Helin) Date: Fri, 28 May 2021 18:32:21 GMT Subject: RFR: bot: add version handler [v3] In-Reply-To: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> References: <0fiPVHTcW1GzeyQd3AqDSEItvH8w1nVz33zEw7mWu0c=.6c5f24b3-a8de-4315-ad59-2b719b247bce@github.com> Message-ID: > Hi all, > > please review this patch that adds a version handler, typically listening on the path `/version`. This simple handler just returns the version of the running bots, useful for scripting or dashboards. Typical configuration: > > > { > "http-server": { > "/version": { > "type": "version" > } > } > } > > > Example of usage: > > > $ curl http://localhost:8080/version > bd09ee70259733dc2e18577da6a36462c900dba3 > > > Testing: > - [x] Tested locally on Linux x64 > > Thanks, > Erik Erik Helin has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains one commit: bot: add version handler ------------- Changes: https://git.openjdk.java.net/skara/pull/1165/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1165&range=02 Stats: 62 lines in 4 files changed: 61 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1165.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1165/head:pull/1165 PR: https://git.openjdk.java.net/skara/pull/1165 From erikj at openjdk.java.net Fri May 28 19:33:31 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 28 May 2021 19:33:31 GMT Subject: RFR: 1031: Declare Skara 1.0 Message-ID: This patch updates the version field in .jcheck/conf to 1.0. We do this to declare that Skara is now considered feature complete and will go into maintenance mode. We will continue to fix issues, but we will not be focusing on any new features in the foreseeable future. ------------- Commit messages: - SKARA-1031 Changes: https://git.openjdk.java.net/skara/pull/1176/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1176&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1031 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/skara/pull/1176.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1176/head:pull/1176 PR: https://git.openjdk.java.net/skara/pull/1176 From iris at openjdk.java.net Fri May 28 19:39:19 2021 From: iris at openjdk.java.net (Iris Clark) Date: Fri, 28 May 2021 19:39:19 GMT Subject: RFR: 1031: Declare Skara 1.0 In-Reply-To: References: Message-ID: On Fri, 28 May 2021 19:30:06 GMT, Erik Joelsson wrote: > This patch updates the version field in .jcheck/conf to 1.0. We do this to declare that Skara is now considered feature complete and will go into maintenance mode. We will continue to fix issues, but we will not be focusing on any new features in the foreseeable future. Congratulations! ------------- Marked as reviewed by iris (no project role). PR: https://git.openjdk.java.net/skara/pull/1176 From darcy at openjdk.java.net Fri May 28 19:50:45 2021 From: darcy at openjdk.java.net (Joe Darcy) Date: Fri, 28 May 2021 19:50:45 GMT Subject: RFR: 1031: Declare Skara 1.0 In-Reply-To: References: Message-ID: On Fri, 28 May 2021 19:30:06 GMT, Erik Joelsson wrote: > This patch updates the version field in .jcheck/conf to 1.0. We do this to declare that Skara is now considered feature complete and will go into maintenance mode. We will continue to fix issues, but we will not be focusing on any new features in the foreseeable future. Marked as reviewed by darcy (Reviewer). ------------- PR: https://git.openjdk.java.net/skara/pull/1176 From erikj at openjdk.java.net Fri May 28 21:58:11 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 28 May 2021 21:58:11 GMT Subject: RFR: 1056: Mirror service is no longer syncing tags Message-ID: We currently have two modes of mirroring repositories using the MirrorBot, either a set of branches, or everything. When limiting branches, tags are excluded, and when mirroring everything, tags are included. I'm adding a new configuration option "tags": true/false. The purpose is to be able to include tags when only mirroring a set of branches. Default is false (to mimic current behavior). I can't see a use case for being able to exclude tags in the all branches case, and implementing it would add quite a bit of complexity. ------------- Commit messages: - SKARA-1056 Changes: https://git.openjdk.java.net/skara/pull/1177/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1177&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1056 Stats: 158 lines in 6 files changed: 146 ins; 0 del; 12 mod Patch: https://git.openjdk.java.net/skara/pull/1177.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1177/head:pull/1177 PR: https://git.openjdk.java.net/skara/pull/1177 From erikj at openjdk.java.net Fri May 28 23:19:24 2021 From: erikj at openjdk.java.net (Erik Joelsson) Date: Fri, 28 May 2021 23:19:24 GMT Subject: RFR: 1051: JCheck complains about issue already used Message-ID: The DuplicateIssuesCheck can sometimes report false positives when the same issueId has been used in separate branches. This patch fixes the check so that only commits that are ancestors of the commit being checked are considered. ------------- Commit messages: - Rename variable - SKARA-1051 Changes: https://git.openjdk.java.net/skara/pull/1178/files Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1178&range=00 Issue: https://bugs.openjdk.java.net/browse/SKARA-1051 Stats: 49 lines in 2 files changed: 45 ins; 0 del; 4 mod Patch: https://git.openjdk.java.net/skara/pull/1178.diff Fetch: git fetch https://git.openjdk.java.net/skara pull/1178/head:pull/1178 PR: https://git.openjdk.java.net/skara/pull/1178