[JENKINS-30101] avoid temporarily offline cause is overwritten #6152

mawinter69 · 2022-01-02T13:49:54Z

See JENKINS-30101.
See JENKINS-30175.
See JENKINS-50313.

When taking an agent temporarily offline the reason why it was done was
overwritten when the connection gets lost. Separate the temporarily offline
cause from those and display both in case they differ.

Testing

Besides the unit tests, tested manually that the offline causes are both shown.
Marking offline now shows the messaged Marked temporarily offline by while disconnecting stays with
DIsconnected by

Proposed changelog entries

Temporarily offline reason is not overwritten by other offline causes

Proposed upgrade guidelines

N/A

Submitter checklist

(If applicable) Jira issue is well described
Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change). Examples
- Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
Appropriate autotests or explanation to why this change has no tests
For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

There are at least 2 approvals for the pull request and no outstanding requests for change
Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
Changelog entries in the PR title and/or Proposed changelog entries are correct
Proper changelog labels are set so that the changelog can be generated automatically
If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

When taking an agent temporarily offline the reason why it was done was lost when the connection gets lost. Separate the temporarily offline cause from those and display both. Fixes: JENKINS-30101, JENKINS-30175 and JENKINS-50313

disconnect should not modify temporarily offline reason

oleg-nenashev

Overall looks good and reasonable. At the same time we need to discuss the desired behavior of getOfflineCauseReason()

core/src/main/resources/hudson/model/Computer/index.jelly

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

just to be on the safe side

mawinter69 · 2022-03-22T17:12:24Z

I don't think that the computer class should use the newly introduced method. It is not required. The existence of the temporarilyofflinecause in the Node class is so that after a restart Jenkins is able to restore the offline cause. But the actual handling of the causes is done in the Computer class and also the UI interacts with Computer and not Node.

github-actions · 2022-09-28T13:57:39Z