Michael Kublin has uploaded a new change for review.
Change subject: core: Replace of KeyValuePairCompat by Pair
......................................................................
core: Replace of KeyValuePairCompat by Pair
The following patch will replace a KeyValuePairCompat by Pair at
creation of SPM proxy and VDSM proxy
Change-Id: I38b8d52c1d982979499539a218d1d81886bd88f6
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java
3 files changed, 12 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/8641/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index dc295f0..6dd49c7 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -24,11 +24,11 @@
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.compat.KeyValuePairCompat;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
import org.ovirt.engine.core.utils.FileUtil;
+import org.ovirt.engine.core.utils.Pair;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation;
@@ -179,13 +179,13 @@
private void InitVdsBroker() {
log.infoFormat("vdsBroker({0},{1})", _vds.gethost_name(),
_vds.getport());
int clientTimeOut = Config.<Integer> GetValue(ConfigValues.vdsTimeout)
* 1000;
- KeyValuePairCompat<VdsServerConnector, HttpClient> returnValue =
+ Pair<VdsServerConnector, HttpClient> returnValue =
XmlRpcUtils.getConnection(_vds.gethost_name(),
_vds.getport(),
clientTimeOut,
VdsServerConnector.class,
Config.<Boolean>
GetValue(ConfigValues.UseSecureConnectionWithServers));
- _vdsProxy = new VdsServerWrapper(returnValue.getKey(),
returnValue.getValue());
+ _vdsProxy = new VdsServerWrapper(returnValue.getFirst(),
returnValue.getSecond());
}
public void UpdateVmDynamic(VmDynamic vmDynamic) {
@@ -613,9 +613,7 @@
AuditLogableBase logable = new AuditLogableBase(vds.getId());
AuditLogDirector.log(logable, AuditLogType.VDS_FAILURE);
- if (ResourceManager.getInstance().getEventListener() != null) {
-
ResourceManager.getInstance().getEventListener().vdsNotResponding(vds);
- }
+
ResourceManager.getInstance().getEventListener().vdsNotResponding(vds);
}
return true;
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
index 4dc95a8..a28d0b9 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
@@ -51,6 +51,7 @@
import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.KeyValuePairCompat;
+import org.ovirt.engine.core.utils.Pair;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
import org.ovirt.engine.core.compat.RefObject;
@@ -133,7 +134,6 @@
// multithreaded
public Object syncObj = new Object();
- public static final String UpVdssInStoragePoolQuery = "STORAGE: status
= UP and DATACENTER = {0}";
private final String storagePoolRefreshJobId;
private final java.util.HashSet<Guid> mTriedVdssList = new
java.util.HashSet<Guid>();
private Guid mCurrentVdsId;
@@ -546,13 +546,13 @@
if (host != null) {
int clientTimeOut = Config.<Integer>
GetValue(ConfigValues.vdsTimeout) * 1000;
- KeyValuePairCompat<IrsServerConnector, HttpClient>
returnValue =
+ Pair<IrsServerConnector, HttpClient> returnValue =
XmlRpcUtils.getConnection(host,
getmIrsPort(),
clientTimeOut,
IrsServerConnector.class,
Config.<Boolean>
GetValue(ConfigValues.UseSecureConnectionWithServers));
- setmIrsProxy(new
IrsServerWrapper(returnValue.getKey(), returnValue.getValue()));
+ setmIrsProxy(new
IrsServerWrapper(returnValue.getFirst(), returnValue.getSecond()));
Class[] inputTypes = new Class[] { storage_pool.class,
boolean.class };
Object[] inputParams = new Object[] { storagePool,
_isSpmStartCalled };
// TODO use thread pool
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java
index 1643867..dfec1e0 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java
@@ -26,7 +26,7 @@
import org.apache.xmlrpc.client.util.ClientFactory;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
-import org.ovirt.engine.core.compat.KeyValuePairCompat;
+import org.ovirt.engine.core.utils.Pair;
import org.ovirt.engine.core.utils.ThreadLocalParamsContainer;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -77,7 +77,7 @@
* - if a connection should be https or http
* @return an instance of the given type.
*/
- public static <T> KeyValuePairCompat<T, HttpClient> getConnection(String
hostName, int port, int clientTimeOut,
+ public static <T> Pair<T, HttpClient> getConnection(String hostName, int
port, int clientTimeOut,
Class<T> type, boolean isSecure) {
URL serverUrl;
String prefix;
@@ -102,7 +102,7 @@
}
@SuppressWarnings("unchecked")
- private static <T> KeyValuePairCompat<T, HttpClient> getHttpConnection(URL
serverUrl, int clientTimeOut,
+ private static <T> Pair<T, HttpClient> getHttpConnection(URL serverUrl,
int clientTimeOut,
Class<T> type) {
XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
config.setServerURL(serverUrl);
@@ -120,8 +120,8 @@
T connector = (T)
clientFactory.newInstance(Thread.currentThread().getContextClassLoader(), type,
null);
T asyncConnector = (T) AsyncProxy.newInstance(connector,
clientTimeOut);
- KeyValuePairCompat<T, HttpClient> returnValue =
- new KeyValuePairCompat<T, HttpClient>(asyncConnector,
httpclient);
+ Pair<T, HttpClient> returnValue =
+ new Pair<T, HttpClient>(asyncConnector, httpclient);
return returnValue;
}
--
To view, visit http://gerrit.ovirt.org/8641
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38b8d52c1d982979499539a218d1d81886bd88f6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkub...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
