Skip to content

The Unified and Autonomous Development Platform

HA support improvement for agent management

Robin Shencda7d3437c4b
diff --git a/pom.xml b/pom.xml
index ce3b5731dd..ad78d91814 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,7 +619,7 @@
</repositories>
<properties>
<commons.version>2.6.0</commons.version>
- <agent.version>1.7.1</agent.version>
+ <agent.version>1.7.2</agent.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
index 6e9785f6a9..3bf6686f7d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
@@ -39,15 +39,9 @@ public interface AgentManager extends EntityManager<Agent> {
void restart(Agent agent);
- void restartLocal(Long agentId);
+ void pause(Agent agent);
- void delete(Collection<Agent> agents);
-
- void unauthorize(Collection<Agent> agents);
-
- void pause(Collection<Agent> agents);
-
- void resume(Collection<Agent> agents);
+ void resume(Agent agent);
void attributesUpdated(Agent agent);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
index 66b773b95d..eade278fc1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
@@ -2,6 +2,7 @@ package io.onedev.server.entitymanager.impl;
import java.io.IOException;
import java.io.InputStream;
+import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -10,10 +11,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -38,10 +39,12 @@ import io.onedev.agent.Message;
import io.onedev.agent.MessageTypes;
import io.onedev.agent.WebsocketUtils;
import io.onedev.agent.job.LogRequest;
+import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
-import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.cluster.ClusterRunnable;
+import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.AgentAttributeManager;
import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.entitymanager.AgentTokenManager;
@@ -67,7 +70,7 @@ import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.validation.AttributeNameValidator;
@Singleton
-public class DefaultAgentManager extends BaseEntityManager<Agent> implements AgentManager {
+public class DefaultAgentManager extends BaseEntityManager<Agent> implements AgentManager, Serializable {
private final AgentAttributeManager attributeManager;
@@ -117,6 +120,10 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
}
}
+ public Object writeReplace() throws ObjectStreamException {
+ return new ManagedSerializedForm(AgentManager.class);
+ }
+
@SuppressWarnings("unchecked")
@Sessional
@Listen
@@ -136,25 +143,22 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
@Override
public void memberRemoved(MembershipEvent membershipEvent) {
if (clusterManager.isLeaderServer()) {
- Set<Long> agentsToRemove = new HashSet<>();
- for (var entry: agentServers.entrySet()) {
- if (entry.getValue().equals(membershipEvent.getMember().getUuid()))
- agentsToRemove.add(entry.getKey());
+ for (var id: agentServers.entrySet().stream()
+ .filter(it->it.getValue().equals(membershipEvent.getMember().getUuid()))
+ .map(it->it.getKey())
+ .collect(Collectors.toSet())) {
+ agentServers.remove(id);
}
- for (Long agentId: agentsToRemove)
- agentServers.remove(agentId);
}
}
});
- if (clusterManager.isLeaderServer()) {
- Query<Object[]> query = dao.getSession().createQuery(String.format("select %s, %s from Agent",
- Agent.PROP_OS_NAME, Agent.PROP_OS_ARCH));
- for (Object[] row: query.list()) {
- osNames.put((String) row[0], (String) row[0]);
- osArchs.put((String) row[1], (String) row[1]);
- }
+ Query<Object[]> query = dao.getSession().createQuery(String.format("select %s, %s from Agent",
+ Agent.PROP_OS_NAME, Agent.PROP_OS_ARCH));
+ for (Object[] row: query.list()) {
+ osNames.put((String) row[0], (String) row[0]);
+ osArchs.put((String) row[1], (String) row[1]);
}
}
@@ -244,12 +248,14 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
public void agentDisconnected(Long agentId) {
agentServers.remove(agentId);
agentSessions.remove(agentId);
- Agent agent = load(agentId);
- if (agent.isTemporal()) {
- removeReferences(agent);
- dao.remove(agent);
+ Agent agent = get(agentId);
+ if (agent != null) {
+ if (agent.isTemporal()) {
+ removeReferences(agent);
+ dao.remove(agent);
+ }
+ listenerRegistry.post(new AgentDisconnected(agent));
}
- listenerRegistry.post(new AgentDisconnected(agent));
}
@Override
@@ -273,22 +279,6 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
query.executeUpdate();
}
- @Transactional
- @Override
- public void delete(Agent agent) {
- removeReferences(agent);
- dao.remove(agent);
-
- agentServers.remove(agent.getId());
- Session prevSession = agentSessions.remove(agent.getId());
- if (prevSession != null) {
- try {
- prevSession.disconnect();
- } catch (IOException e) {
- }
- }
- }
-
@Sessional
@Override
public Agent findByName(String name) {
@@ -367,89 +357,129 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
}
- @Override
- public void restartLocal(Long agentId) {
- Session session = agentSessions.get(agentId);
- if (session != null)
- new Message(MessageTypes.RESTART, new byte[0]).sendBy(session);
- }
-
@Sessional
@Override
public void restart(Agent agent) {
- UUID serverUUID = agentServers.get(agent.getId());
- if (serverUUID != null)
- clusterManager.submitToServer(serverUUID, new RestartTask(agent.getId()));
+ Long agentId = agent.getId();
+ UUID serverUUID = agentServers.get(agentId);
+ if (serverUUID != null) {
+ clusterManager.submitToServer(serverUUID, new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ Session session = agentSessions.get(agentId);
+ if (session != null)
+ new Message(MessageTypes.RESTART, new byte[0]).sendBy(session);
+ return null;
+ }
+
+ });
+ }
}
@Transactional
@Override
- public void delete(Collection<Agent> agents) {
- for (Agent agent: agents) {
- removeReferences(agent);
- dao.remove(agent);
+ public void delete(Agent agent) {
+ for (Agent eachAgent: agent.getToken().getAgents()) {
+ removeReferences(eachAgent);
+ dao.remove(eachAgent);
+ Long eachAgentId = eachAgent.getId();
- agentServers.remove(agent.getId());
- Session prevSession = agentSessions.remove(agent.getId());
- if (prevSession != null) {
- try {
- prevSession.disconnect();
- } catch (IOException e) {
+ transactionManager.runAfterCommit(new ClusterRunnable() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void run() {
+ UUID serverUUID = agentServers.remove(eachAgentId);
+ if (serverUUID != null) {
+ clusterManager.submitToServer(serverUUID, new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ Session prevSession = agentSessions.remove(eachAgentId);
+ if (prevSession != null) {
+ new Message(MessageTypes.STOP, new byte[0]).sendBy(prevSession);
+ prevSession.disconnect();
+ }
+ return null;
+ }
+
+ });
+ }
}
- }
+
+ });
}
+ dao.remove(agent.getToken());
}
@Transactional
@Override
- public void unauthorize(Collection<Agent> agents) {
- Collection<AgentToken> tokens = new HashSet<>();
- for (Agent agent: agents)
- tokens.add(agent.getToken());
-
- for (AgentToken token: tokens) {
- for (Agent agent: token.getAgents())
- delete(agent);
- dao.remove(token);
- }
- }
-
- @Transactional
- @Override
- public void pause(Collection<Agent> agents) {
- for (Agent agent: agents) {
- agent.setPaused(true);
- save(agent);
- }
+ public void pause(Agent agent) {
+ agent.setPaused(true);
+ save(agent);
}
@Transactional
@Override
- public void resume(Collection<Agent> agents) {
- for (Agent agent: agents) {
- agent.setPaused(false);
- save(agent);
- }
+ public void resume(Agent agent) {
+ agent.setPaused(false);
+ save(agent);
}
@Override
public void attributesUpdated(Agent agent) {
- Session session = agentSessions.get(agent.getId());
- if (session != null) {
- byte[] attributeBytes = SerializationUtils.serialize((Serializable) agent.getAttributeMap());
- new Message(MessageTypes.UPDATE_ATTRIBUTES, attributeBytes).sendBy(session);
+ Long agentId = agent.getId();
+ var attributes = agent.getAttributeMap();
+ UUID serverUUID = agentServers.get(agentId);
+ if (serverUUID != null) {
+ clusterManager.submitToServer(serverUUID, new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ Session session = agentSessions.get(agent.getId());
+ if (session != null) {
+ byte[] attributeBytes = SerializationUtils.serialize((Serializable) attributes);
+ new Message(MessageTypes.UPDATE_ATTRIBUTES, attributeBytes).sendBy(session);
+ }
+ return null;
+ }
+
+ });
}
}
@Override
public List<String> getAgentLog(Agent agent) {
- Session session = agentSessions.get(agent.getId());
- if (session != null) {
- try {
- return WebsocketUtils.call(session, new LogRequest(), 60000);
- } catch (InterruptedException | TimeoutException e) {
- throw new RuntimeException(e);
- }
+ Long agentId = agent.getId();
+ UUID serverUUID = agentServers.get(agentId);
+ if (serverUUID != null) {
+ return clusterManager.runOnServer(serverUUID, new ClusterTask<List<String>>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<String> call() throws Exception {
+ Session session = agentSessions.get(agentId);
+ if (session != null) {
+ try {
+ return WebsocketUtils.call(session, new LogRequest(), 60000);
+ } catch (InterruptedException | TimeoutException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ });
} else {
return new ArrayList<>();
}
@@ -460,21 +490,4 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
return agentSessions.get(agentId);
}
- private static class RestartTask implements ClusterTask<Void> {
-
- private static final long serialVersionUID = 1L;
-
- private final Long agentId;
-
- public RestartTask(Long agentId) {
- this.agentId = agentId;
- }
-
- @Override
- public Void call() throws Exception {
- OneDev.getInstance(AgentManager.class).restartLocal(agentId);
- return null;
- }
-
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 4ceda39067..845f1ecfb2 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -33,6 +33,7 @@ import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.pubsub.Listen;
import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.exception.SystemNotReadyException;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.Group;
@@ -266,11 +267,15 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Sessional
@Override
public User findByAccessToken(String accessToken) {
- UserFacade facade = cache.findByAccessToken(accessToken);
- if (facade != null)
- return load(facade.getId());
- else
- return null;
+ if (cache != null) {
+ UserFacade facade = cache.findByAccessToken(accessToken);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } else {
+ throw new SystemNotReadyException();
+ }
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
index f06c498dd8..7956e99edc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
@@ -1,7 +1,6 @@
package io.onedev.server.web.page.admin.buildsetting.agent;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -270,10 +269,8 @@ class AgentListPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- Collection<Agent> agents = new ArrayList<>();
- for (IModel<Agent> each: selectionColumn.getSelections())
- agents.add(each.getObject());
- OneDev.getInstance(AgentManager.class).pause(agents);
+ for (var model: selectionColumn.getSelections())
+ getAgentManager().pause(model.getObject());
target.add(body);
selectionColumn.getSelections().clear();
Session.get().success("Paused selected agents");
@@ -314,10 +311,8 @@ class AgentListPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- Collection<Agent> agents = new ArrayList<>();
- for (IModel<Agent> each: selectionColumn.getSelections())
- agents.add(each.getObject());
- OneDev.getInstance(AgentManager.class).resume(agents);
+ for (var model: selectionColumn.getSelections())
+ getAgentManager().resume(model.getObject());
target.add(body);
selectionColumn.getSelections().clear();
Session.get().success("Resumed selected agents");
@@ -364,7 +359,7 @@ class AgentListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
for (IModel<Agent> each: selectionColumn.getSelections())
- OneDev.getInstance(AgentManager.class).restart(each.getObject());
+ getAgentManager().restart(each.getObject());
target.add(body);
selectionColumn.getSelections().clear();
Session.get().success("Restart command issued to selected agents");
@@ -408,7 +403,7 @@ class AgentListPanel extends Panel {
@Override
public String getLabel() {
- return "Remove Selected Offline Agents";
+ return "Remove Selected Agents";
}
@Override
@@ -423,22 +418,16 @@ class AgentListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- Collection<Agent> agents = new ArrayList<>();
- for (IModel<Agent> each: selectionColumn.getSelections()) {
- Agent agent = each.getObject();
- if (!agent.isOnline())
- agents.add(agent);
- }
- OneDev.getInstance(AgentManager.class).delete(agents);
+ for (var model: selectionColumn.getSelections())
+ getAgentManager().delete(model.getObject());
selectionColumn.getSelections().clear();
target.add(body);
}
@Override
protected String getConfirmMessage() {
- return "Removed selected offline agents. Please note that tokens used by these agents will "
- + "NOT be removed, and they will reappear here if go online. "
- + "Type <code>yes</code> below to confirm";
+ return "Removed selected agents. Please note that other agents sharing tokens with these "
+ + "agents will also be removed. Type <code>yes</code> below to confirm";
}
@Override
@@ -462,73 +451,7 @@ class AgentListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select offline agents to remove");
- }
- }
-
- };
- }
-
- });
-
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return "Unauthorize Selected Agents";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxLink<Void>(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- dropdown.close();
-
- new ConfirmModalPanel(target) {
-
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- Collection<Agent> agents = new ArrayList<>();
- for (IModel<Agent> each: selectionColumn.getSelections()) {
- Agent agent = each.getObject();
- if (!agent.isOnline())
- agents.add(agent);
- }
- OneDev.getInstance(AgentManager.class).unauthorize(agents);
- selectionColumn.getSelections().clear();
- target.add(body);
- }
-
- @Override
- protected String getConfirmMessage() {
- return "Removing selected agents as well as tokens used by them. Please note that other agents sharing "
- + "tokens with these agents will also be removed. Type <code>yes</code> below to confirm";
- }
-
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
-
- };
-
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(!selectionColumn.getSelections().isEmpty());
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled()) {
- tag.put("disabled", "disabled");
- tag.put("title", "Please select offline agents to remove");
+ tag.put("title", "Please select agents to remove");
}
}
@@ -557,11 +480,8 @@ class AgentListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- Collection<Agent> agents = new ArrayList<>();
- for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
- agents.add(it.next());
- }
- OneDev.getInstance(AgentManager.class).pause(agents);
+ for (var it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();)
+ getAgentManager().pause(it.next());
selectionColumn.getSelections().clear();
target.add(body);
Session.get().success("Paused all queried agents");
@@ -622,11 +542,8 @@ class AgentListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- Collection<Agent> agents = new ArrayList<>();
- for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
- agents.add(it.next());
- }
- OneDev.getInstance(AgentManager.class).resume(agents);
+ for (var it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();)
+ getAgentManager().resume(it.next());
target.add(body);
selectionColumn.getSelections().clear();
Session.get().success("Resumed all queried agents");
@@ -687,8 +604,8 @@ class AgentListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();)
- OneDev.getInstance(AgentManager.class).restart(it.next());
+ for (var it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();)
+ getAgentManager().restart(it.next());
target.add(body);
selectionColumn.getSelections().clear();
Session.get().success("Restart command issued to all queried agents");
@@ -733,75 +650,7 @@ class AgentListPanel extends Panel {
@Override
public String getLabel() {
- return "Remove All Queried Offline Agents";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxLink<Void>(id) {
-
- @SuppressWarnings("unchecked")
- @Override
- public void onClick(AjaxRequestTarget target) {
- dropdown.close();
-
- new ConfirmModalPanel(target) {
-
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- Collection<Agent> agents = new ArrayList<>();
- for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
- Agent agent = it.next();
- if (!agent.isOnline())
- agents.add(agent);
- }
- OneDev.getInstance(AgentManager.class).delete(agents);
- target.add(body);
- selectionColumn.getSelections().clear();
- }
-
- @Override
- protected String getConfirmMessage() {
- return "Remove all queried offline agents. Please note that this will NOT remove "
- + "tokens used by these agents, and they will reappear here if go online. "
- + "Type <code>yes</code> below to confirm";
- }
-
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
-
- };
-
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(agentsTable.getItemCount() != 0);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled()) {
- tag.put("disabled", "disabled");
- tag.put("title", "No offline agents to remove");
- }
- }
-
- };
- }
-
- });
-
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return "Unauthorize All Queried Agents";
+ return "Remove All Queried Agents";
}
@Override
@@ -817,19 +666,16 @@ class AgentListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- Collection<Agent> agents = new ArrayList<>();
- for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
- agents.add(it.next());
- }
- OneDev.getInstance(AgentManager.class).unauthorize(agents);
+ for (var it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();)
+ getAgentManager().delete(it.next());
target.add(body);
selectionColumn.getSelections().clear();
}
@Override
protected String getConfirmMessage() {
- return "Removing all queried agents as well as tokens used by them. Please note that other agents sharing "
- + "tokens with these agents will also be removed. Type <code>yes</code> below to confirm";
+ return "Removed all queried agents. Please note that other agents sharing tokens with "
+ + "these agents will also be removed. Type <code>yes</code> below to confirm";
}
@Override
@@ -853,7 +699,7 @@ class AgentListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No agents to unauthorize");
+ tag.put("title", "No agents to remove");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java
index 8e48010ebd..308468a62e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java
@@ -32,6 +32,10 @@ public class AgentOverviewPage extends AgentDetailPage {
super(params);
}
+ private AgentManager getAgentManager() {
+ return OneDev.getInstance(AgentManager.class);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -40,7 +44,7 @@ public class AgentOverviewPage extends AgentDetailPage {
@Override
public void onClick() {
- OneDev.getInstance(AgentManager.class).restart(getAgent());
+ getAgentManager().restart(getAgent());
setResponsePage(AgentOverviewPage.class, AgentOverviewPage.paramsOf(getAgent()));
Session.get().success("Restart command issued");
}
@@ -51,11 +55,11 @@ public class AgentOverviewPage extends AgentDetailPage {
@Override
public void onClick() {
- OneDev.getInstance(AgentManager.class).delete(getAgent());
+ getAgentManager().delete(getAgent());
setResponsePage(AgentListPage.class);
Session.get().success("Agent removed");
}
-
+
}.add(new ConfirmClickModifier("Do you really want to remove this agent?")));
add(new Link<Void>("pauseOrResume") {
@@ -75,8 +79,10 @@ public class AgentOverviewPage extends AgentDetailPage {
@Override
public void onClick() {
- getAgent().setPaused(!getAgent().isPaused());
- OneDev.getInstance(AgentManager.class).save(getAgent());
+ if (getAgent().isPaused())
+ getAgentManager().resume(getAgent());
+ else
+ getAgentManager().pause(getAgent());
setResponsePage(AgentOverviewPage.class, AgentOverviewPage.paramsOf(getAgent()));
}
@@ -108,7 +114,7 @@ public class AgentOverviewPage extends AgentDetailPage {
for (AgentAttribute attribute: bean.getAttributes())
attributeMap.put(attribute.getName(), attribute.getValue());
OneDev.getInstance(AgentAttributeManager.class).syncAttributes(getAgent(), attributeMap);
- OneDev.getInstance(AgentManager.class).attributesUpdated(getAgent());
+ getAgentManager().attributesUpdated(getAgent());
Session.get().success("Attributes saved");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
index c92e423508..42db158bbb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
@@ -23,7 +23,7 @@ import io.onedev.server.util.PathNode;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.admin.usermanagement.membership.UserMembershipsPage;
+import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;
import io.onedev.server.web.util.editablebean.NewUserBean;
@SuppressWarnings("serial")
@@ -85,7 +85,7 @@ public class NewUserPage extends AdministrationPage {
newUserBean = new NewUserBean();
replace(BeanContext.edit("editor", newUserBean));
} else {
- setResponsePage(UserMembershipsPage.class, UserMembershipsPage.paramsOf(user));
+ setResponsePage(UserProfilePage.class, UserProfilePage.paramsOf(user));
}
}
}