Skip to content

Commit 2fb696a

Browse files
author
Pearl Dsilva
committed
revert
1 parent 11e2b87 commit 2fb696a

7 files changed

Lines changed: 22 additions & 42 deletions

File tree

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6864,8 +6864,7 @@ public String getLogMessage() {
68646864
}
68656865
}
68666866

6867-
public void modifyClvmVolumesStateForMigration(List<DiskDef> disks, LibvirtComputingResource resource,
6868-
VirtualMachineTO vmSpec, ClvmVolumeState state) {
6867+
public static void modifyClvmVolumesStateForMigration(List<DiskDef> disks, VirtualMachineTO vmSpec, ClvmVolumeState state) {
68696868
for (DiskDef disk : disks) {
68706869
if (isClvmVolume(disk, vmSpec)) {
68716870
String volumePath = disk.getDiskPath();

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
343343
// active (in shared mode) and deletion can route directly to the source host
344344
// without fanning out across the cluster to find an inactive LV.
345345
if (to != null && !command.isClvmCrossPoolMigration()) {
346-
libvirtComputingResource.modifyClvmVolumesStateForMigration(disks, libvirtComputingResource, to, LibvirtComputingResource.ClvmVolumeState.DEACTIVATE);
346+
LibvirtComputingResource.modifyClvmVolumesStateForMigration(disks, to, LibvirtComputingResource.ClvmVolumeState.DEACTIVATE);
347347
}
348348

349349
deleteOrDisconnectDisksOnSourcePool(libvirtComputingResource, migrateDiskInfoList, disks);
@@ -394,7 +394,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
394394
}
395395
// Revert CLVM volumes to exclusive mode on failure
396396
if (to != null && result != null) {
397-
libvirtComputingResource.modifyClvmVolumesStateForMigration(disks, libvirtComputingResource, to, LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE);
397+
LibvirtComputingResource.modifyClvmVolumesStateForMigration(disks, to, LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE);
398398
}
399399
} catch (final LibvirtException e) {
400400
logger.trace("Ignoring libvirt error.", e);

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ public Answer execute(final PostMigrationCommand command, final LibvirtComputing
6262

6363
List<DiskDef> disks = libvirtComputingResource.getDisks(conn, vmName);
6464
logger.debug("[CLVM Post-Migration] Processing volumes for VM {} to claim exclusive locks on any CLVM volumes", vmName);
65-
libvirtComputingResource.modifyClvmVolumesStateForMigration(
65+
LibvirtComputingResource.modifyClvmVolumesStateForMigration(
6666
disks,
67-
libvirtComputingResource,
6867
vm,
6968
LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE
7069
);

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ public Answer execute(PreMigrationCommand command, LibvirtComputingResource libv
5959

6060
List<DiskDef> disks = libvirtComputingResource.getDisks(conn, vmName);
6161
logger.info("Converting CLVM volumes to shared mode for VM: {}", vmName);
62-
libvirtComputingResource.modifyClvmVolumesStateForMigration(
62+
LibvirtComputingResource.modifyClvmVolumesStateForMigration(
6363
disks,
64-
libvirtComputingResource,
6564
vmSpec,
6665
LibvirtComputingResource.ClvmVolumeState.SHARED
6766
);

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,8 @@ public Answer execute(final PrepareForMigrationCommand command, final LibvirtCom
128128
// Activate CLVM volumes in shared mode on destination host for live migration
129129
try {
130130
List<LibvirtVMDef.DiskDef> disks = libvirtComputingResource.getDisks(conn, vm.getName());
131-
libvirtComputingResource.modifyClvmVolumesStateForMigration(
131+
LibvirtComputingResource.modifyClvmVolumesStateForMigration(
132132
disks,
133-
libvirtComputingResource,
134133
vm,
135134
LibvirtComputingResource.ClvmVolumeState.SHARED
136135
);

‎plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapperTest.java‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,17 @@ public void testExecute_ClvmVolumes_ConvertedToExclusiveMode() throws LibvirtExc
9595
mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
9696
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
9797

98-
mockedResource.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
98+
mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
9999
eq(disks),
100-
eq(libvirtComputingResource),
101100
eq(virtualMachineTO),
102101
eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
103102
)).then(invocation -> null);
104103

105104
Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
106105

107106
Assert.assertTrue(answer.getResult());
108-
mockedResource.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
107+
mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
109108
eq(disks),
110-
eq(libvirtComputingResource),
111109
eq(virtualMachineTO),
112110
eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
113111
), times(1));
@@ -124,8 +122,7 @@ public void testExecute_ClvmNgVolumes_ConvertedToExclusiveMode() throws LibvirtE
124122
mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
125123
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
126124

127-
mockedResource.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
128-
any(),
125+
mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
129126
any(),
130127
any(),
131128
any()
@@ -134,9 +131,8 @@ public void testExecute_ClvmNgVolumes_ConvertedToExclusiveMode() throws LibvirtE
134131
Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
135132

136133
Assert.assertTrue(answer.getResult());
137-
mockedResource.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
134+
mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
138135
eq(disks),
139-
eq(libvirtComputingResource),
140136
eq(virtualMachineTO),
141137
eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
142138
), times(1));
@@ -153,8 +149,7 @@ public void testExecute_MixedVolumes_OnlyClvmConverted() throws LibvirtException
153149
mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
154150
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
155151

156-
mockedResource.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
157-
any(),
152+
mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
158153
any(),
159154
any(),
160155
any()
@@ -163,9 +158,8 @@ public void testExecute_MixedVolumes_OnlyClvmConverted() throws LibvirtException
163158
Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
164159

165160
Assert.assertTrue(answer.getResult());
166-
mockedResource.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
161+
mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
167162
eq(disks),
168-
eq(libvirtComputingResource),
169163
eq(virtualMachineTO),
170164
eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
171165
), times(1));
@@ -251,8 +245,7 @@ public void testExecute_MultipleClvmVolumes_AllConverted() throws LibvirtExcepti
251245
mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
252246
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
253247

254-
mockedResource.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
255-
any(),
248+
mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
256249
any(),
257250
any(),
258251
any()
@@ -261,9 +254,8 @@ public void testExecute_MultipleClvmVolumes_AllConverted() throws LibvirtExcepti
261254
Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
262255

263256
Assert.assertTrue(answer.getResult());
264-
mockedResource.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
257+
mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
265258
eq(disks),
266-
eq(libvirtComputingResource),
267259
eq(virtualMachineTO),
268260
eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
269261
), times(1));
@@ -292,8 +284,7 @@ public void testExecute_ClvmAndClvmNgMixed_BothConverted() throws LibvirtExcepti
292284
mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
293285
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
294286

295-
mockedResource.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
296-
any(),
287+
mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
297288
any(),
298289
any(),
299290
any()
@@ -302,9 +293,8 @@ public void testExecute_ClvmAndClvmNgMixed_BothConverted() throws LibvirtExcepti
302293
Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
303294

304295
Assert.assertTrue(answer.getResult());
305-
mockedResource.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
296+
mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
306297
eq(disks),
307-
eq(libvirtComputingResource),
308298
eq(virtualMachineTO),
309299
eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
310300
), times(1));

‎plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapperTest.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,17 @@ public void testExecute_ClvmVolumes_ConvertedToSharedMode() throws LibvirtExcept
100100
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
101101

102102
try (MockedStatic<LibvirtComputingResource> mockedStatic = Mockito.mockStatic(LibvirtComputingResource.class)) {
103-
mockedStatic.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
103+
mockedStatic.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
104104
eq(disks),
105-
eq(libvirtComputingResource),
106105
eq(virtualMachineTO),
107106
eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
108107
)).then(invocation -> null);
109108

110109
Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
111110

112111
Assert.assertTrue(answer.getResult());
113-
mockedStatic.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
112+
mockedStatic.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
114113
eq(disks),
115-
eq(libvirtComputingResource),
116114
eq(virtualMachineTO),
117115
eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
118116
), times(1));
@@ -128,8 +126,7 @@ public void testExecute_ClvmNgVolumes_ConvertedToSharedMode() throws LibvirtExce
128126
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
129127

130128
try (MockedStatic<LibvirtComputingResource> mockedStatic = Mockito.mockStatic(LibvirtComputingResource.class)) {
131-
mockedStatic.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
132-
any(),
129+
mockedStatic.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
133130
any(),
134131
any(),
135132
any()
@@ -138,9 +135,8 @@ public void testExecute_ClvmNgVolumes_ConvertedToSharedMode() throws LibvirtExce
138135
Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
139136

140137
Assert.assertTrue(answer.getResult());
141-
mockedStatic.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
138+
mockedStatic.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
142139
eq(disks),
143-
eq(libvirtComputingResource),
144140
eq(virtualMachineTO),
145141
eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
146142
), times(1));
@@ -155,8 +151,7 @@ public void testExecute_MixedVolumes_OnlyClvmConverted() throws LibvirtException
155151
when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
156152

157153
try (MockedStatic<LibvirtComputingResource> mockedStatic = Mockito.mockStatic(LibvirtComputingResource.class)) {
158-
mockedStatic.when(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
159-
any(),
154+
mockedStatic.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
160155
any(),
161156
any(),
162157
any()
@@ -165,9 +160,8 @@ public void testExecute_MixedVolumes_OnlyClvmConverted() throws LibvirtException
165160
Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
166161

167162
Assert.assertTrue(answer.getResult());
168-
mockedStatic.verify(() -> libvirtComputingResource.modifyClvmVolumesStateForMigration(
163+
mockedStatic.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
169164
eq(disks),
170-
eq(libvirtComputingResource),
171165
eq(virtualMachineTO),
172166
eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
173167
), times(1));

0 commit comments

Comments
 (0)