git commit: updated refs/heads/master to f9e1154
Repository: cloudstack
Updated Branches:
refs/heads/master 354756219 -> f9e11540c
Fixed few coverity issues
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f9e11540
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f9e11540
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f9e11540
Branch: refs/heads/master
Commit: f9e11540c7e70f3d6f1a8cc660b4067c2e1ec876
Parents: 3547562
Author: Santhosh Edukulla
Authored: Mon Aug 11 16:02:19 2014 +0530
Committer: Santhosh Edukulla
Committed: Mon Aug 11 16:02:19 2014 +0530
--
.../src/com/cloud/agent/dao/impl/PropertiesStorage.java | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 11 +++
server/src/com/cloud/alert/AlertManagerImpl.java | 7 ---
server/src/com/cloud/network/IpAddressManagerImpl.java | 4 +++-
4 files changed, 15 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e11540/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
--
diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
index 08c8049..df1b1ea 100755
--- a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
+++ b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
@@ -100,7 +100,7 @@ public class PropertiesStorage implements StorageComponent {
}
@Override
-public String getName() {
+public synchronized String getName() {
return _name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e11540/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 67882e6..387c80b 100644
---
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -3988,11 +3988,14 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
s_logger.debug("Creating VLAN " + tag + " on host " + _host.ip + "
on device " + nPifr.device);
}
VLAN vlan = VLAN.create(conn, nPif, tag, vlanNetwork);
-VLAN.Record vlanr = vlan.getRecord(conn);
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("VLAN is created for " + tag + ". The uuid is " +
vlanr.uuid);
+if (vlan != null) {
+VLAN.Record vlanr = vlan.getRecord(conn);
+if (vlanr != null) {
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("VLAN is created for " + tag + ". The uuid
is " + vlanr.uuid);
+}
+}
}
-
return vlanNetwork;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e11540/server/src/com/cloud/alert/AlertManagerImpl.java
--
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java
b/server/src/com/cloud/alert/AlertManagerImpl.java
index 5b667ad..1dba13b 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -278,10 +278,11 @@ public class AlertManagerImpl extends ManagerBase
implements AlertManager, Confi
// Calculate CPU and RAM capacities
// get all hosts...even if they are not in 'UP' state
List hosts =
_resourceMgr.listAllNotInMaintenanceHostsInOneZone(Host.Type.Routing, null);
-for (HostVO host : hosts) {
-_capacityMgr.updateCapacityForHost(host);
+if (hosts != null) {
+for (HostVO host : hosts) {
+_capacityMgr.updateCapacityForHost(host);
+}
}
-
if (s_logger.isDebugEnabled()) {
s_logger.debug("Done executing cpu/ram capacity update");
s_logger.debug("Executing storage capacity update");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e11540/server/src/com/cloud/network/IpAddressManagerImpl.java
--
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java
b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 2cd544d..1f78966 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAdd
git commit: updated refs/heads/hotfix/CLOUDSTACK-7303 to adadfe1
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/CLOUDSTACK-7303 [created] adadfe11f
Fixed CLOUDSTACK-7303 [LDAP] while importing ldap users, update the user info
if it already exists in cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/adadfe11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adadfe11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adadfe11
Branch: refs/heads/hotfix/CLOUDSTACK-7303
Commit: adadfe11f09b6da5fa5cc5f1eed792d48e879ddb
Parents: 3547562
Author: Rajani Karuturi
Authored: Mon Aug 11 16:34:30 2014 +0530
Committer: Rajani Karuturi
Committed: Mon Aug 11 16:34:30 2014 +0530
--
api/src/com/cloud/user/AccountService.java | 4 ++
.../contrail/management/MockAccountManager.java | 13 ++
.../api/command/LdapImportUsersCmd.java | 14 +-
.../ldap/LdapImportUsersCmdSpec.groovy | 33 ++
.../src/com/cloud/user/AccountManagerImpl.java | 48
.../com/cloud/user/MockAccountManagerImpl.java | 13 ++
6 files changed, 104 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adadfe11/api/src/com/cloud/user/AccountService.java
--
diff --git a/api/src/com/cloud/user/AccountService.java
b/api/src/com/cloud/user/AccountService.java
index eac8a76..2785264 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -79,6 +79,10 @@ public interface AccountService {
Account getActiveAccountByName(String accountName, Long domainId);
+UserAccount getActiveUserAccount(String username, Long domainId);
+
+UserAccount updateUser(Long userId, String firstName, String lastName,
String email, String userName, String password, String apiKey, String
secretKey, String timeZone);
+
Account getActiveAccountById(long accountId);
Account getAccount(long accountId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adadfe11/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
--
diff --git
a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index 4136b5c..2f97a0f 100644
---
a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -137,6 +137,19 @@ public class MockAccountManager extends ManagerBase
implements AccountManager {
}
@Override
+public UserAccount getActiveUserAccount(String username, Long domainId) {
+// TODO Auto-generated method stub
+return null;
+}
+
+@Override
+public UserAccount updateUser(Long userId, String firstName, String
lastName, String email, String userName, String password, String apiKey, String
secretKey,
+ String timeZone) {
+// TODO Auto-generated method stub
+return null;
+}
+
+@Override
public User getActiveUser(long arg0) {
return _systemUser;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adadfe11/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
--
diff --git
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
index 6f7be90..0095336 100644
---
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
+++
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
@@ -26,6 +26,7 @@ import java.util.UUID;
import javax.inject.Inject;
import com.cloud.user.Account;
+import com.cloud.user.UserAccount;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -108,11 +109,20 @@ public class LdapImportUsersCmd extends BaseListCmd {
private void createCloudstackUserAccount(LdapUser user, String
accountName, Domain domain) {
Account account = _accountService.getActiveAccountByName(accountName,
domain.getId());
if (account == null) {
+s_logger.debug("No account exists wi
git commit: updated refs/heads/master to fd96ad0
Repository: cloudstack
Updated Branches:
refs/heads/master f9e11540c -> fd96ad02d
Fixed few coverity reported issues around concurrency, null checks
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fd96ad02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fd96ad02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fd96ad02
Branch: refs/heads/master
Commit: fd96ad02d7a29a94927c74e6092a816e7d235cf9
Parents: f9e1154
Author: Santhosh Edukulla
Authored: Mon Aug 11 16:55:23 2014 +0530
Committer: Santhosh Edukulla
Committed: Mon Aug 11 16:55:23 2014 +0530
--
.../mom/rabbitmq/RabbitMQEventBus.java | 5 ++--
.../hyperv/manager/HypervManagerImpl.java | 27 ++--
.../cloud/resource/DummyHostServerResource.java | 2 +-
.../com/cloud/utils/concurrency/TestClock.java | 24 -
4 files changed, 35 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd96ad02/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
--
diff --git
a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
index a1f4c2b..2d389f2 100644
---
a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
+++
b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
@@ -60,7 +60,7 @@ public class RabbitMQEventBus extends ManagerBase implements
EventBus {
private static String username;
private static String password;
-public static void setVirtualHost(String virtualHost) {
+public synchronized static void setVirtualHost(String virtualHost) {
RabbitMQEventBus.virtualHost = virtualHost;
}
@@ -481,8 +481,7 @@ public class RabbitMQEventBus extends ManagerBase
implements EventBus {
}
@Override
-public boolean stop() {
-
+public synchronized boolean stop() {
if (s_connection.isOpen()) {
for (String subscriberId : s_subscribers.keySet()) {
Ternary subscriberDetails =
s_subscribers.get(subscriberId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd96ad02/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java
--
diff --git
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java
index 71a619a..c512445 100644
---
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java
+++
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java
@@ -359,20 +359,21 @@ public class HypervManagerImpl implements HypervManager {
private void shutdownCleanup() {
s_logger.info("Cleanup mounted mount points used in current session");
+synchronized (_storageMounts) {
+ for (String mountPoint : _storageMounts.values()) {
+s_logger.info("umount NFS mount: " + mountPoint);
-for (String mountPoint : _storageMounts.values()) {
-s_logger.info("umount NFS mount: " + mountPoint);
-
-String result = null;
-Script command = new Script(true, "umount", _timeout, s_logger);
-command.add(mountPoint);
-result = command.execute();
-if (result != null) {
-s_logger.warn("Unable to umount " + mountPoint + " due to " +
result);
-}
-File file = new File(mountPoint);
-if (file.exists()) {
-file.delete();
+String result = null;
+Script command = new Script(true, "umount", _timeout,
s_logger);
+command.add(mountPoint);
+result = command.execute();
+if (result != null) {
+s_logger.warn("Unable to umount " + mountPoint + " due to
" + result);
+}
+File file = new File(mountPoint);
+if (file.exists()) {
+file.delete();
+}
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd96ad02/server/src/com/cloud/resource/DummyHostServerResource.java
--
diff --git a/server/src/com/cloud/resource/DummyHostServerResource.java
b/server/src/com/cloud/resource/DummyHostServerResource.java
index 41f5d3d..d787b86 100644
--- a/ser
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/hotfix/CLOUDSTACK-7303 [deleted] adadfe11f
git commit: updated refs/heads/master to 736ff5f
Repository: cloudstack
Updated Branches:
refs/heads/master 5efded3ae -> 736ff5f8e
Fixed CLOUDSTACK-7303 [LDAP] while importing ldap users, update the user
info if it already exists in cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/736ff5f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/736ff5f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/736ff5f8
Branch: refs/heads/master
Commit: 736ff5f8e5b88061c488f7dae35df3d555eaa5df
Parents: 5efded3
Author: Rajani Karuturi
Authored: Mon Aug 11 17:52:16 2014 +0530
Committer: Rajani Karuturi
Committed: Mon Aug 11 17:54:31 2014 +0530
--
api/src/com/cloud/user/AccountService.java | 4 ++
.../contrail/management/MockAccountManager.java | 13 ++
.../api/command/LdapImportUsersCmd.java | 14 +-
.../ldap/LdapImportUsersCmdSpec.groovy | 33 ++
.../src/com/cloud/user/AccountManagerImpl.java | 48
.../com/cloud/user/MockAccountManagerImpl.java | 13 ++
6 files changed, 104 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/736ff5f8/api/src/com/cloud/user/AccountService.java
--
diff --git a/api/src/com/cloud/user/AccountService.java
b/api/src/com/cloud/user/AccountService.java
index eac8a76..2785264 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -79,6 +79,10 @@ public interface AccountService {
Account getActiveAccountByName(String accountName, Long domainId);
+UserAccount getActiveUserAccount(String username, Long domainId);
+
+UserAccount updateUser(Long userId, String firstName, String lastName,
String email, String userName, String password, String apiKey, String
secretKey, String timeZone);
+
Account getActiveAccountById(long accountId);
Account getAccount(long accountId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/736ff5f8/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
--
diff --git
a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index 4136b5c..2f97a0f 100644
---
a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -137,6 +137,19 @@ public class MockAccountManager extends ManagerBase
implements AccountManager {
}
@Override
+public UserAccount getActiveUserAccount(String username, Long domainId) {
+// TODO Auto-generated method stub
+return null;
+}
+
+@Override
+public UserAccount updateUser(Long userId, String firstName, String
lastName, String email, String userName, String password, String apiKey, String
secretKey,
+ String timeZone) {
+// TODO Auto-generated method stub
+return null;
+}
+
+@Override
public User getActiveUser(long arg0) {
return _systemUser;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/736ff5f8/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
--
diff --git
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
index 6f7be90..1533494 100644
---
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
+++
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
@@ -26,6 +26,7 @@ import java.util.UUID;
import javax.inject.Inject;
import com.cloud.user.Account;
+import com.cloud.user.UserAccount;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -108,11 +109,20 @@ public class LdapImportUsersCmd extends BaseListCmd {
private void createCloudstackUserAccount(LdapUser user, String
accountName, Domain domain) {
Account account = _accountService.getActiveAccountByName(accountName,
domain.getId());
if (account == null) {
+s_logger.debug("No account exists with name: " + accountName
git commit: updated refs/heads/master to 5efded3
Repository: cloudstack
Updated Branches:
refs/heads/master fd96ad02d -> 5efded3ae
Fixed few coverity issues reported
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5efded3a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5efded3a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5efded3a
Branch: refs/heads/master
Commit: 5efded3ae93c1e926a641fe445611926101513f0
Parents: fd96ad0
Author: Santhosh Edukulla
Authored: Mon Aug 11 17:52:32 2014 +0530
Committer: Santhosh Edukulla
Committed: Mon Aug 11 17:52:32 2014 +0530
--
agent/src/com/cloud/agent/Agent.java| 39 ++--
.../consoleproxy/ConsoleProxyResource.java | 31
2 files changed, 35 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5efded3a/agent/src/com/cloud/agent/Agent.java
--
diff --git a/agent/src/com/cloud/agent/Agent.java
b/agent/src/com/cloud/agent/Agent.java
index b0113c7..2b33f5c 100755
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -297,26 +297,27 @@ public class Agent implements HandlerFactory,
IAgentControl {
public void sendStartup(Link link) {
final StartupCommand[] startup = _resource.initialize();
-final Command[] commands = new Command[startup.length];
-for (int i = 0; i < startup.length; i++) {
-setupStartupCommand(startup[i]);
-commands[i] = startup[i];
-}
-
-final Request request = new Request(_id != null ? _id : -1, -1,
commands, false, false);
-request.setSequence(getNextSequence());
+if (startup != null) {
+final Command[] commands = new Command[startup.length];
+for (int i = 0; i < startup.length; i++) {
+setupStartupCommand(startup[i]);
+commands[i] = startup[i];
+}
+final Request request = new Request(_id != null ? _id : -1, -1,
commands, false, false);
+request.setSequence(getNextSequence());
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Sending Startup: " + request.toString());
-}
-synchronized (this) {
-_startup = new StartupTask(link);
-_timer.schedule(_startup, _startupWait);
-}
-try {
-link.send(request.toBytes());
-} catch (final ClosedChannelException e) {
-s_logger.warn("Unable to send reques: " + request.toString());
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("Sending Startup: " + request.toString());
+}
+synchronized (this) {
+_startup = new StartupTask(link);
+_timer.schedule(_startup, _startupWait);
+}
+try {
+link.send(request.toBytes());
+} catch (final ClosedChannelException e) {
+s_logger.warn("Unable to send reques: " + request.toString());
+}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5efded3a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
--
diff --git
a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
index c3dea2e..16173aa 100644
--- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
+++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
@@ -120,11 +120,10 @@ public class ConsoleProxyResource extends
ServerResourceBase implements ServerRe
}
private void disableRpFilter() {
-try {
-FileWriter fstream = new
FileWriter("/proc/sys/net/ipv4/conf/eth2/rp_filter");
-BufferedWriter out = new BufferedWriter(fstream);
+try (FileWriter fstream = new
FileWriter("/proc/sys/net/ipv4/conf/eth2/rp_filter");
+ BufferedWriter out = new BufferedWriter(fstream);)
+{
out.write("0");
-out.close();
} catch (IOException e) {
s_logger.warn("Unable to disable rp_filter");
}
@@ -242,18 +241,18 @@ public class ConsoleProxyResource extends
ServerResourceBase implements ServerRe
if (_localgw != null) {
String mgmtHost = (String)params.get("host");
-addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, mgmtHost);
-
-String internalDns1 = (String)params.get("internaldns1");
-if (internalDns1 == null) {
-s_logger.warn("No DNS entry found during configurat
git commit: updated refs/heads/4.4 to 9a7cdc0
Repository: cloudstack
Updated Branches:
refs/heads/4.4 edb5650c7 -> 9a7cdc0ad
Small fix for people that have JDK 1.8 installed on MacOSX and don't bother to
fix their links
(cherry picked from commit 8b5ec648423b7672846ca93f362269019bac3f94)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a7cdc0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a7cdc0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a7cdc0a
Branch: refs/heads/4.4
Commit: 9a7cdc0adbaa5ae6707086dff81944853ec9efd2
Parents: edb5650
Author: Hugo Trippaers
Authored: Thu Jun 5 09:54:46 2014 +0200
Committer: Daan Hoogland
Committed: Mon Aug 11 15:58:38 2014 +0200
--
.../org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java| 5 +++--
utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a7cdc0a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
--
diff --git
a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
b/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
index 9a57ff0..fd2f9f3 100644
---
a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
+++
b/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
@@ -26,12 +26,13 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.framework.events.Event;
import org.apache.cloudstack.framework.events.EventBus;
import org.apache.cloudstack.framework.events.EventBusException;
import org.apache.cloudstack.framework.events.EventSubscriber;
import org.apache.cloudstack.framework.events.EventTopic;
-import org.apache.log4j.Logger;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
@@ -41,7 +42,7 @@ public class InMemoryEventBus extends ManagerBase implements
EventBus {
private static final Logger s_logger =
Logger.getLogger(InMemoryEventBus.class);
-private final static ConcurrentHashMap> subscribers;
+private final static Map>
subscribers;
static {
subscribers = new ConcurrentHashMap>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a7cdc0a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
--
diff --git a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
index 24d4d11..14eae16 100755
--- a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
+++ b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
@@ -45,7 +45,7 @@ import com.cloud.utils.component.AdapterBase;
@Local(value = {BackoffAlgorithm.class})
public class ConstantTimeBackoff extends AdapterBase implements
BackoffAlgorithm, ConstantTimeBackoffMBean {
long _time;
-private final ConcurrentHashMap _asleep = new
ConcurrentHashMap();
+private final Map _asleep = new ConcurrentHashMap();
private final static Log LOG =
LogFactory.getLog(ConstantTimeBackoff.class);
@Override
git commit: updated refs/heads/master to 97efbc5
Repository: cloudstack
Updated Branches:
refs/heads/master 736ff5f8e -> 97efbc56e
CLOUDSTACK-7283: listUsers - for regular user, only return the caller info. If
there are more users under the same account, their information should never be
returned
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97efbc56
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97efbc56
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97efbc56
Branch: refs/heads/master
Commit: 97efbc56e4e24563d1a68db9da500054867683c6
Parents: 736ff5f
Author: Alena Prokharchyk
Authored: Mon Aug 11 13:51:11 2014 -0700
Committer: Alena Prokharchyk
Committed: Mon Aug 11 13:51:11 2014 -0700
--
server/src/com/cloud/api/query/QueryManagerImpl.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97efbc56/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index c30683e..0b4eb6c 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -26,9 +26,6 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@ -100,6 +97,8 @@ import
org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.query.QueryService;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.query.dao.AccountJoinDao;
import com.cloud.api.query.dao.AffinityGroupJoinDao;
@@ -386,6 +385,13 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
boolean listAll = cmd.listAll();
Long id = cmd.getId();
+if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
+long currentId = CallContext.current().getCallingUser().getId();
+if (id != null && currentId != id.longValue()) {
+throw new PermissionDeniedException("Calling user is not
authorized to see the user requested by id");
+}
+id = currentId;
+}
Ternary
domainIdRecursiveListProject = new Ternary(
cmd.getDomainId(), cmd.isRecursive(), null);
_accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(),
null, permittedAccounts,
git commit: updated refs/heads/master to d1d722f
Repository: cloudstack
Updated Branches:
refs/heads/master 97efbc56e -> d1d722f9b
CLOUDSTACK-7295: VMs is Stopped state have no host ID, resulting in NPE
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d1d722f9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d1d722f9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d1d722f9
Branch: refs/heads/master
Commit: d1d722f9bde91ce36f494142f4651a22c6795d6b
Parents: 97efbc5
Author: amoghvk
Authored: Mon Aug 11 14:53:02 2014 -0700
Committer: amoghvk
Committed: Mon Aug 11 14:56:58 2014 -0700
--
.../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 7 +--
.../xenserver/src/com/cloud/hypervisor/XenServerGuru.java | 7 +--
server/src/com/cloud/hypervisor/KVMGuru.java | 7 +--
server/src/com/cloud/hypervisor/LXCGuru.java | 7 +--
4 files changed, 20 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1d722f9/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index 08d12f2..abc7cdb 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -314,8 +314,11 @@ public class VMwareGuru extends HypervisorGuruBase
implements HypervisorGuru, Co
to.setOs(guestOS.getDisplayName());
to.setHostName(vm.getHostName());
HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
-GuestOSHypervisorVO guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
-if (guestOsMapping == null) {
+GuestOSHypervisorVO guestOsMapping = null;
+if (host != null) {
+guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
+}
+if (guestOsMapping == null || host == null) {
to.setPlatformEmulator(null);
} else {
to.setPlatformEmulator(guestOsMapping.getGuestOsName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1d722f9/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
--
diff --git
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
index c10f4a0..c1de8bb 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
@@ -92,8 +92,11 @@ public class XenServerGuru extends HypervisorGuruBase
implements HypervisorGuru
GuestOSVO guestOS =
_guestOsDao.findById(vm.getVirtualMachine().getGuestOSId());
to.setOs(guestOS.getDisplayName());
HostVO host = hostDao.findById(vm.getVirtualMachine().getHostId());
-GuestOSHypervisorVO guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
-if (guestOsMapping == null) {
+GuestOSHypervisorVO guestOsMapping = null;
+if (host != null) {
+guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
+}
+if (guestOsMapping == null || host == null) {
to.setPlatformEmulator(null);
} else {
to.setPlatformEmulator(guestOsMapping.getGuestOsName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1d722f9/server/src/com/cloud/hypervisor/KVMGuru.java
--
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java
b/server/src/com/cloud/hypervisor/KVMGuru.java
index 80279ad..492342c 100644
--- a/server/src/com/cloud/hypervisor/KVMGuru.java
+++ b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -60,8 +60,11 @@ public class KVMGuru extends HypervisorGuruBase implements
HypervisorGuru {
GuestOSVO guestOS =
_guestOsDao.findById(vm.getVirtualMachine().getGuestOSId());
to.setOs(guestOS.getDisplayName());
HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
-GuestOSHypervisorVO guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHyperviso
git commit: updated refs/heads/hotfix/4.4-6905 to 9800b9f
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4-6905 [created] 9800b9f07
CLOUDSTACK-7295: VMs is Stopped state have no host ID, resulting in NPE
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9800b9f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9800b9f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9800b9f0
Branch: refs/heads/hotfix/4.4-6905
Commit: 9800b9f07a5b887da93661c12441e0d5f99fd717
Parents: 9a7cdc0
Author: amoghvk
Authored: Mon Aug 11 14:53:02 2014 -0700
Committer: amoghvk
Committed: Mon Aug 11 14:56:07 2014 -0700
--
.../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 7 +--
.../xen/src/com/cloud/hypervisor/XenServerGuru.java | 7 +--
server/src/com/cloud/hypervisor/KVMGuru.java | 7 +--
server/src/com/cloud/hypervisor/LXCGuru.java | 7 +--
4 files changed, 20 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9800b9f0/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index f82c2c1..8a04910 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -314,8 +314,11 @@ public class VMwareGuru extends HypervisorGuruBase
implements HypervisorGuru, Co
to.setOs(guestOS.getDisplayName());
to.setHostName(vm.getHostName());
HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
-GuestOSHypervisorVO guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
-if (guestOsMapping == null) {
+GuestOSHypervisorVO guestOsMapping = null;
+if (host != null) {
+guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
+}
+if (guestOsMapping == null || host == null) {
to.setPlatformEmulator(null);
} else {
to.setPlatformEmulator(guestOsMapping.getGuestOsName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9800b9f0/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
--
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
index 3f950d6..5f8b031 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
@@ -92,8 +92,11 @@ public class XenServerGuru extends HypervisorGuruBase
implements HypervisorGuru
GuestOSVO guestOS =
_guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId());
to.setOs(guestOS.getDisplayName());
HostVO host = hostDao.findById(vm.getVirtualMachine().getHostId());
-GuestOSHypervisorVO guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
-if (guestOsMapping == null) {
+GuestOSHypervisorVO guestOsMapping = null;
+if (host != null) {
+guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(),
getHypervisorType().toString(), host.getHypervisorVersion());
+}
+if (guestOsMapping == null || host == null) {
to.setPlatformEmulator(null);
} else {
to.setPlatformEmulator(guestOsMapping.getGuestOsName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9800b9f0/server/src/com/cloud/hypervisor/KVMGuru.java
--
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java
b/server/src/com/cloud/hypervisor/KVMGuru.java
index f000a1a..b6a7651 100644
--- a/server/src/com/cloud/hypervisor/KVMGuru.java
+++ b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -60,8 +60,11 @@ public class KVMGuru extends HypervisorGuruBase implements
HypervisorGuru {
GuestOSVO guestOS =
_guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId());
to.setOs(guestOS.getDisplayName());
HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
-GuestOSHypervisorVO guestOsMapping =
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId
git commit: updated refs/heads/master to 737f76d
Repository: cloudstack
Updated Branches:
refs/heads/master d1d722f9b -> 737f76df8
CLOUDSTACK-7312:ISOs cannot be downloaded from URLs without matching
file extensions.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/737f76df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/737f76df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/737f76df
Branch: refs/heads/master
Commit: 737f76df8c8b47ba347ae46fc10d73b1fee6
Parents: d1d722f
Author: Min Chen
Authored: Mon Aug 11 14:53:02 2014 -0700
Committer: Min Chen
Committed: Mon Aug 11 15:00:32 2014 -0700
--
server/src/com/cloud/template/HypervisorTemplateAdapter.java | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/737f76df/server/src/com/cloud/template/HypervisorTemplateAdapter.java
--
diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
index 20309d6..9b17c30 100755
--- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -111,12 +111,6 @@ public class HypervisorTemplateAdapter extends
TemplateAdapterBase {
public TemplateProfile prepare(RegisterIsoCmd cmd) throws
ResourceAllocationException {
TemplateProfile profile = super.prepare(cmd);
String url = profile.getUrl();
-
-if ((!url.toLowerCase().endsWith("iso")) &&
(!url.toLowerCase().endsWith("iso.zip")) &&
(!url.toLowerCase().endsWith("iso.bz2")) &&
-(!url.toLowerCase().endsWith("iso.gz"))) {
-throw new InvalidParameterValueException("Please specify a valid
iso");
-}
-
UriUtils.validateUrl(url);
profile.setUrl(url);
// Check that the resource limit for secondary storage won't be
exceeded
