Skip to content

Attempt to resolve ovm3 jenkins failure #497

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

Closed
rsafonseca wants to merge 6 commits into from
Closed

Attempt to resolve ovm3 jenkins failure #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d367391
Resolve unsafe cast warnings reported by lint checker
rsafonseca Jun 21, 2015
fcc1e42
Cleanup some lint checker warning in base classes
rsafonseca Jun 21, 2015
2f274e7
Specify all external dependencies in pom
rsafonseca Jun 21, 2015
c765e25
Root cause of failure is memory abuse in XenTest.java class ;) This s…
rsafonseca Jun 21, 2015
d06ed93
Reduce about 1k String objects from being instantiated
rsafonseca Jun 21, 2015
90c4101
Specify all dependency versions in pom.xml
rsafonseca Jun 22, 2015
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
30 changes: 25 additions & 5 deletions plugins/hypervisors/ovm3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,31 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${cs.xml-apis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
<version>${cs.xmlrpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
<version>${cs.xmlrpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${cs.lang3.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${cs.log4j.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
Expand Down
7 changes: 4 additions & 3 deletions ...ns/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/CloudstackPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public static class ReturnCode {
put("err", null);
put("out", null);
}
private static final long serialVersionUID = 5L;
};
public ReturnCode() {
}
Expand Down Expand Up @@ -120,7 +121,7 @@ public boolean dom0CheckPort(String ip, Integer port, Integer retries,
Integer sleep = interval;
try {
while (!x && retries > 0) {
x = (Boolean) nullIsFalseCallWrapper("check_dom0_port", ip, port, interval);
x = nullIsFalseCallWrapper("check_dom0_port", ip, port, interval);
retries--;
Thread.sleep(sleep * 1000);
}
Expand Down Expand Up @@ -177,9 +178,9 @@ public boolean dom0CheckStorageHealth(String path, String script, String guid, I
return (Boolean) callWrapper("check_dom0_storage_health", path, script, guid, timeout);
}
public boolean ovsMkdirs(String dir) throws Ovm3ResourceException{
return (Boolean) nullIsTrueCallWrapper("ovs_mkdirs", dir);
return nullIsTrueCallWrapper("ovs_mkdirs", dir);
}
public boolean ovsMkdirs(String dir, Integer mode) throws Ovm3ResourceException{
return (Boolean) nullIsTrueCallWrapper("ovs_mkdirs", dir, mode);
return nullIsTrueCallWrapper("ovs_mkdirs", dir, mode);
}
}
1 change: 1 addition & 0 deletions plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Linux.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ public static class FileSystem {
put(MOUNTPOINT, null);
put("Uuid", null);
}
private static final long serialVersionUID = 123L;
};

public Boolean setDetails(Map<String, Object> fs) {
Expand Down
5 changes: 3 additions & 2 deletions plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public static class Interface {
put("MAC", null);
put("Vlan", null);
}
private static final long serialVersionUID = 6L;
};

public Interface() {
Expand Down Expand Up @@ -294,7 +295,7 @@ public Boolean stopOvsBrConfig(String br, String dev)

public Object ovsBrConfig(String action, String br, String net)
throws Ovm3ResourceException {
return (Object) callWrapper("ovs_br_config", action, br, net);
return callWrapper("ovs_br_config", action, br, net);
}

/* 1 is untagged, goes till 4095 */
Expand All @@ -319,7 +320,7 @@ public Boolean startOvsVlanBridge(String br, String net, int vlan)

private Object ovsVlanBridge(String action, String br, String net, int vlan)
throws Ovm3ResourceException {
return (Object) callWrapper("ovs_vlan_bridge", action, br, net, vlan);
return callWrapper("ovs_vlan_bridge", action, br, net, vlan);
}

/*
Expand Down
4 changes: 3 additions & 1 deletion plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.w3c.dom.Document;

Expand All @@ -38,6 +38,7 @@ public class Pool extends OvmObject {
add("xen");
add("utility");
}
private static final long serialVersionUID = 1L;
};
private List<String> poolHosts = new ArrayList<String>();
private final List<String> poolRoles = new ArrayList<String>();
Expand Down Expand Up @@ -155,6 +156,7 @@ public Boolean takeOwnership33x(final String uuid,
put("manager_certificate", managerCert);
put("signed_server_certificate", signedCert);
}
private static final long serialVersionUID = 1L;
};
Boolean rc = nullIsTrueCallWrapper("take_ownership", mgrConfig);
/* because it restarts when it's done.... 2000? -sigh- */
Expand Down
3 changes: 3 additions & 0 deletions plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Repository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public List<String> getRepoList() throws Ovm3ResourceException {
}

public static class RepoDbDetails {
private static final long serialVersionUID = 2L;
private final Map<String, String> dbEntry = new HashMap<String, String>() {
{
put("Uuid", null);
Expand All @@ -74,6 +75,7 @@ public static class RepoDbDetails {
put("Manager_uuid", null);
put("Status", null);
}
private static final long serialVersionUID = 1L;
};

public RepoDbDetails() {
Expand Down Expand Up @@ -127,6 +129,7 @@ public static class RepoDetails {
private List<String> virtualDisks = new ArrayList<String>();
private List<String> isos = new ArrayList<String>();
private final Map<String, String> dbEntry = new HashMap<String, String>() {
private static final long serialVersionUID = 1L;
{
put("Repository_UUID", null);
put(VERSION, null);
Expand Down
3 changes: 3 additions & 0 deletions plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public class StorageDetails {
put(NAME, EMPTY_STRING);
put(MOUNTOPTIONS, new ArrayList<String>());
}
private static final long serialVersionUID = 3L;
};
public Map<String, Object> getDetails() {
return storageDetails;
Expand Down Expand Up @@ -180,6 +181,7 @@ public class StorageServer {
put(USEDSIZE, 0);
put(NAME, EMPTY_STRING);
}
private static final long serialVersionUID = 4L;
};
public Map<String, Object> getDetails() {
return storageSource;
Expand Down Expand Up @@ -285,6 +287,7 @@ public class FileProperties {
put(FILEPATH, EMPTY_STRING);
put(FILESIZE, EMPTY_STRING);
}
private static final long serialVersionUID = 1234L;
};
public Map<String, Object> getProperties() {
return fileProperties;
Expand Down
6 changes: 5 additions & 1 deletion plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;

public class Xen extends OvmObject {
Expand All @@ -48,6 +48,7 @@ public Xen(Connection c) {
*/
public class Vm {
/* 'vfb': [ 'type=vnc,vncunused=1,vnclisten=127.0.0.1,keymap=en-us'] */
private static final long serialVersionUID = 1L;
private final List<String> vmVncElement = new ArrayList<String>();
private Map<String, String> vmVnc = new HashMap<String, String>() {
{
Expand All @@ -56,6 +57,7 @@ public class Vm {
put(VNCLISTEN, "127.0.0.1");
put("keymap", "en-us");
}
private static final long serialVersionUID = 1L;
};

/*
Expand All @@ -75,6 +77,7 @@ public class Vm {
put("protocol", "x86_32-abi");
put("uname", "");
}
private static final long serialVersionUID = 1L;
};

/* 'vif': [ 'mac=00:21:f6:00:00:00,bridge=c0a80100'] */
Expand Down Expand Up @@ -141,6 +144,7 @@ public class Vm {
put(DOMTYPE, vmDomainType);
put(EXTRA, vmExtra);
}
private static final long serialVersionUID = 1L;
};

public boolean isControlDomain() {
Expand Down
Loading