Commit f7d6a24f682bd2410a634f979c1e682165f5fd4f

[HQ-3812] Agent Sync count is not displayed correctly
after upgrading to latest 4.6.5 build.
Changed the status line to represent the number of
agents that can sync plugins, since they are new,
instead of basing it on plugin sync reports.
hq-server/src/main/java/org/hyperic/hq/appdef/server/session/AgentDAO.java
(14 / 0)
  
5151@Repository
5252public class AgentDAO extends HibernateDAO<Agent> {
5353 private static final Log log = LogFactory.getLog(AgentDAO.class);
54 private static final String LIMIT_A_TO_CURRENT_AGENTS = "a.version >= :serverVersion ";
5455 private static final String LIMIT_A_TO_OLD_AGENTS = "a.version < :serverVersion ";
5556
5657 private final ServerConfigManager serverConfigManager;
……
168168 query.setParameter("serverVersion", serverConfigManager.getServerMajorVersion());
169169 return ((Number) query.uniqueResult()).longValue();
170170 }
171
172
173 public long getNumAutoUpdatingAgents() {
174 final String sql = new StringBuilder(150)
175 .append("select count(a) from Agent a where ")
176 .append(LIMIT_A_TO_CURRENT_AGENTS)
177 .append("and exists (select 1 from Platform p where p.agent.id = a.id)")
178 .toString();
179 final Query query = getSession().createQuery(sql);
180 query.setParameter("serverVersion", serverConfigManager.getServerMajorVersion());
181 return ((Number) query.uniqueResult()).longValue();
182 }
183
171184
172185 /**
173186 *
hq-server/src/main/java/org/hyperic/hq/appdef/server/session/AgentManagerImpl.java
(1 / 1)
  
15941594
15951595 @Transactional(readOnly=true)
15961596 public long getNumAutoUpdatingAgents() {
1597 return agentPluginStatusDAO.getNumAutoUpdatingAgents();
1597 return agentDao.getNumAutoUpdatingAgents();
15981598 }
15991599
16001600 @Transactional(readOnly=true)
hq-server/src/main/java/org/hyperic/hq/appdef/server/session/AgentPluginStatusDAO.java
(0 / 12)
  
277277 .list();
278278 }
279279
280 Long getNumAutoUpdatingAgents() {
281 String serverMajorVersion = serverConfigManager.getServerMajorVersion();
282 final String sql = new StringBuilder(150)
283 .append("select count(distinct agent_id) from EAM_AGENT_PLUGIN_STATUS s ")
284 .append(LIMIT_S_TO_CURRENT_AGENTS)
285 .append("and exists (select 1 from EAM_PLATFORM p where p.agent_id = s.agent_id)")
286 .toString();
287 final SQLQuery query = getSession().createSQLQuery(sql);
288 query.setParameter("serverVersion", serverMajorVersion);
289 return ((Number) query.uniqueResult()).longValue();
290 }
291
292280 @SuppressWarnings("unchecked")
293281 public Collection<Agent> getAutoUpdatingAgents() {
294282 String serverMajorVersion = serverConfigManager.getServerMajorVersion();

Comments

Add a new comment:

Login or create an account to post a comment

Add your comment