|
30 | 30 | import javax.inject.Inject; |
31 | 31 | import javax.naming.ConfigurationException; |
32 | 32 |
|
33 | | -import com.cloud.vm.VirtualMachine; |
| 33 | +import org.apache.commons.lang.ObjectUtils; |
| 34 | +import org.apache.log4j.Logger; |
| 35 | +import org.springframework.stereotype.Component; |
| 36 | + |
| 37 | +import com.google.gson.Gson; |
34 | 38 |
|
35 | 39 | import org.apache.cloudstack.api.ApiConstants; |
36 | 40 | import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; |
|
47 | 51 | import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; |
48 | 52 | import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; |
49 | 53 | import org.apache.cloudstack.utils.identity.ManagementServerNode; |
50 | | -import org.apache.commons.lang.ObjectUtils; |
51 | | -import org.apache.log4j.Logger; |
52 | | -import org.springframework.stereotype.Component; |
53 | 54 |
|
54 | 55 | import com.cloud.agent.AgentManager; |
55 | 56 | import com.cloud.agent.api.Answer; |
|
153 | 154 | import com.cloud.utils.db.QueryBuilder; |
154 | 155 | import com.cloud.utils.db.SearchBuilder; |
155 | 156 | import com.cloud.utils.db.SearchCriteria; |
156 | | -import com.cloud.utils.db.TransactionLegacy; |
157 | 157 | import com.cloud.utils.db.SearchCriteria.Func; |
158 | 158 | import com.cloud.utils.db.SearchCriteria.Op; |
159 | 159 | import com.cloud.utils.db.Transaction; |
160 | 160 | import com.cloud.utils.db.TransactionCallback; |
161 | 161 | import com.cloud.utils.db.TransactionCallbackNoReturn; |
| 162 | +import com.cloud.utils.db.TransactionLegacy; |
162 | 163 | import com.cloud.utils.db.TransactionStatus; |
163 | 164 | import com.cloud.utils.exception.CloudRuntimeException; |
164 | 165 | import com.cloud.utils.fsm.NoTransitionException; |
|
167 | 168 | import com.cloud.utils.ssh.SSHCmdHelper; |
168 | 169 | import com.cloud.utils.ssh.SshException; |
169 | 170 | import com.cloud.vm.VMInstanceVO; |
| 171 | +import com.cloud.vm.VirtualMachine; |
170 | 172 | import com.cloud.vm.VirtualMachine.State; |
171 | 173 | import com.cloud.vm.VirtualMachineManager; |
172 | 174 | import com.cloud.vm.dao.VMInstanceDao; |
173 | | -import com.google.gson.Gson; |
174 | 175 |
|
175 | 176 | @Component |
176 | 177 | @Local({ResourceManager.class, ResourceService.class}) |
@@ -880,7 +881,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) { |
880 | 881 | try { |
881 | 882 | resourceStateTransitTo(host, ResourceState.Event.DeleteHost, _nodeId); |
882 | 883 | } catch (NoTransitionException e) { |
883 | | - s_logger.debug("Cannot transmit host " + host.getId() + "to Enabled state", e); |
| 884 | + s_logger.debug("Cannot transmit host " + host.getId() + " to Enabled state", e); |
884 | 885 | } |
885 | 886 |
|
886 | 887 | // Delete the associated entries in host ref table |
|
0 commit comments