Skip to content

Fix temporary offline state of computer is lost on config submit #26154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timja merged 1 commit into from
Jan 23, 2026
Merged

Fix temporary offline state of computer is lost on config submit #26154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/src/main/java/hudson/model/Computer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,7 +1503,9 @@ public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOE
throw new FormException(Messages.Slave_InvalidConfig_Executors(nodeName), "numExecutors");
}

OfflineCause offlineCause = node.getTemporaryOfflineCause();
Node result = node.reconfigure(req, req.getSubmittedForm());
result.setTemporaryOfflineCause(offlineCause);
Jenkins.get().getNodesObject().replaceNode(this.getNode(), result);

if (result.getNodeProperty(DiskSpaceMonitorNodeProperty.class) != null) {
Expand Down
12 changes: 12 additions & 0 deletions test/src/test/java/hudson/model/ComputerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,18 @@ void computerIconDependsOnOfflineCause() throws Exception {
assertThat(computer.getIcon(), equalTo(cause.getComputerIcon()));
}

@Test
@Issue("#26146")
void computerTemporaryOfflineCauseStaysOnConfigRound() throws Exception {
var agent = j.createSlave();
var computer = agent.toComputer();
var offlineCause = new OfflineCause.UserCause(User.getOrCreateByIdOrFullName("username"), "Initial cause");
computer.setTemporaryOfflineCause(offlineCause);
j.configRoundtrip(agent);
agent = (DumbSlave) j.jenkins.getNode(agent.getNodeName());
assertThat(agent.getTemporaryOfflineCause(), equalTo(offlineCause));
}

@Test
@LocalData
void removeUserDetailsFromOfflineCause() throws Exception {
Expand Down
Loading