Skip to content

Collect VM stats only from hosts connected to this management server #14398

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

Open
MitchDrage wants to merge 1 commit into
base: 4.20
Choose a base branch
from
Open

Collect VM stats only from hosts connected to this management server #14398

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
1 change: 1 addition & 0 deletions server/src/main/java/com/cloud/server/StatsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,7 @@ class VmStatsCollector extends AbstractStatsCollector {
protected void runInContext() {
try {
SearchCriteria<HostVO> sc = createSearchCriteriaForHostTypeRoutingStateUpAndNotInMaintenance();
sc.addAnd("managementServerId", SearchCriteria.Op.EQ, managementServerNodeId);
Comment thread
MitchDrage marked this conversation as resolved.
List<HostVO> hosts = _hostDao.search(sc, null);

logger.debug(String.format("VmStatsCollector is running to process VMs across %d UP hosts", hosts.size()));
Expand Down
46 changes: 46 additions & 0 deletions server/src/test/java/com/cloud/server/StatsCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,16 @@
import com.cloud.agent.api.GetStorageStatsCommand;
import com.cloud.agent.api.VmDiskStatsEntry;
import com.cloud.agent.api.VmStatsEntry;
import com.cloud.gpu.dao.HostGpuGroupsDao;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.server.StatsCollector.ExternalStatsProtocol;
import com.cloud.storage.StorageStats;
import com.cloud.storage.VolumeStatsVO;
import com.cloud.storage.dao.VolumeStatsDao;
import com.cloud.user.VmDiskStatisticsVO;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VmStats;
import com.cloud.vm.VmStatsVO;
Expand Down Expand Up @@ -118,6 +122,12 @@ public class StatsCollectorTest {
@Mock
private StoragePoolVO mockPool;

@Mock
private HostDao hostDaoMock;

@Mock
private HostGpuGroupsDao hostGpuGroupsDaoMock;

private static Gson gson = new Gson();

private Gson msStatsGson;
Expand Down Expand Up @@ -378,6 +388,42 @@ public void volumeStatsCleanerTestCatchesCloudRuntimeExceptionAndKeepsRunning()
Mockito.verify(statsCollector).cleanUpVolumeStats();
}

@SuppressWarnings("unchecked")
private SearchCriteria<HostVO> mockHostSearch() {
SearchCriteria<HostVO> searchCriteriaMock = Mockito.mock(SearchCriteria.class);
when(hostDaoMock.createSearchCriteria()).thenReturn(searchCriteriaMock);
when(hostDaoMock.search(searchCriteriaMock, null)).thenReturn(new ArrayList<>());
ReflectionTestUtils.setField(statsCollector, "_hostDao", hostDaoMock);
return searchCriteriaMock;
}

@Test
public void vmStatsCollectorTestOnlyCollectsFromHostsConnectedToThisManagementServer() {
SearchCriteria<HostVO> searchCriteriaMock = mockHostSearch();
// Example msid (the management server's MAC address as a long); any value works
long msid = 90520745551922L;
statsCollector.managementServerNodeId = msid;
StatsCollector.VmStatsCollector vmStatsCollector = statsCollector.new VmStatsCollector();

vmStatsCollector.run();

Mockito.verify(searchCriteriaMock).addAnd("managementServerId", SearchCriteria.Op.EQ, msid);
Mockito.verify(hostDaoMock).search(searchCriteriaMock, null);
}

@Test
public void hostCollectorTestCollectsFromAllHosts() {
SearchCriteria<HostVO> searchCriteriaMock = mockHostSearch();
when(hostGpuGroupsDaoMock.listHostIds()).thenReturn(new ArrayList<>());
ReflectionTestUtils.setField(statsCollector, "_hostGpuGroupsDao", hostGpuGroupsDaoMock);
StatsCollector.HostCollector hostCollector = statsCollector.new HostCollector();

hostCollector.run();

Mockito.verify(searchCriteriaMock, Mockito.never()).addAnd(Mockito.eq("managementServerId"), Mockito.any(), Mockito.any());
Mockito.verify(hostDaoMock).search(searchCriteriaMock, null);
}

@Test
public void persistVirtualMachineStatsTestPersistsSuccessfully() {
statsCollector.msId = 1L;
Expand Down
Loading