You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/07 18:50:09 UTC
[1/5] git commit: updated refs/heads/master to 51aa698
Repository: cloudstack
Updated Branches:
refs/heads/master 0e057ad69 -> 51aa69801
CLOUDSTACK-9645: Moving stop of management in config inside if statement.
It will only run the stop command when --no-start is specified.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6b2eb3b9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6b2eb3b9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6b2eb3b9
Branch: refs/heads/master
Commit: 6b2eb3b99ae16bbb9daa5f515cc6c2abe10c543d
Parents: e8de07a
Author: Pall Helgason <pa...@greenqloud.com>
Authored: Tue Dec 8 13:28:08 2015 +0000
Committer: jeff <je...@greenqloud.com>
Committed: Thu Dec 1 12:59:37 2016 +0000
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfigServer.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b2eb3b9/python/lib/cloudutils/serviceConfigServer.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index dce85a0..377552f 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -137,9 +137,8 @@ class cloudManagementConfig(serviceCfgBase):
except:
pass
- self.syscfg.svo.stopService("cloudstack-management")
-
if self.syscfg.env.noStart == False:
+ self.syscfg.svo.stopService("cloudstack-management")
if self.syscfg.svo.enableService("cloudstack-management"):
return True
else:
[5/5] git commit: updated refs/heads/master to 51aa698
Posted by bh...@apache.org.
Merge pull request #1566 from greenqloud/pr-fix-mgmt-setup-master
[CLOUDSTACK-9645] Followup fix for #1162: Add support for not (re)starting server after cloud-setup-management.New version against #1330, opened against master.
```
Moving stop of management in config inside if statement.
It will only run the stop command when --no-start is specified.
```
* pr/1566:
CLOUDSTACK-9645: Moving stop of management in config inside if statement.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51aa6980
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51aa6980
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51aa6980
Branch: refs/heads/master
Commit: 51aa69801059e165e2e9e9434a07776ef9b3bd47
Parents: 58317eb 6b2eb3b
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 8 00:19:46 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 8 00:19:46 2016 +0530
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfigServer.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[3/5] git commit: updated refs/heads/master to 51aa698
Posted by bh...@apache.org.
Merge pull request #1809 from Accelerite/CLOUDSTACK-9646
CLOUDSTACK-9646: No usage is generated for uploaded templates/volumes from localpublished usage events on successful upload of template or volume.
* pr/1809:
CLOUDSTACK-9646: No usage is generated for uploaded templates/volumes from local
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de7a06ef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de7a06ef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de7a06ef
Branch: refs/heads/master
Commit: de7a06efec3e18d601048dc0ef7f4b52512fecf7
Parents: 2e5373b aed5943
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 8 00:17:40 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 8 00:17:40 2016 +0530
----------------------------------------------------------------------
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
[4/5] git commit: updated refs/heads/master to 51aa698
Posted by bh...@apache.org.
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/58317ebd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/58317ebd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/58317ebd
Branch: refs/heads/master
Commit: 58317ebd1485712fe21f95a4ffb2889d520e9464
Parents: 0e057ad de7a06e
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 8 00:18:56 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 8 00:18:56 2016 +0530
----------------------------------------------------------------------
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
[2/5] git commit: updated refs/heads/master to 51aa698
Posted by bh...@apache.org.
CLOUDSTACK-9646: No usage is generated for uploaded templates/volumes from local
published usage events on successful upload of template or volume.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aed59433
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aed59433
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aed59433
Branch: refs/heads/master
Commit: aed59433a2ef73666e162df84efe717d9e2d7bfa
Parents: f231c8c
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Wed Sep 7 12:21:23 2016 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Mon Dec 5 10:51:23 2016 +0530
----------------------------------------------------------------------
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed59433/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
index 2d9f544..10406b5 100755
--- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
@@ -26,6 +26,8 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import com.cloud.configuration.Resource;
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventUtils;
import com.cloud.user.ResourceLimitService;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -309,6 +311,12 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto
stateMachine.transitTo(tmpVolume, Event.OperationSucceeded, null, _volumeDao);
_resourceLimitMgr.incrementResourceCount(volume.getAccountId(), Resource.ResourceType.secondary_storage, answer.getVirtualSize());
+ // publish usage events
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_UPLOAD, tmpVolume.getAccountId(),
+ tmpVolumeDataStore.getDataStoreId(), tmpVolume.getId(), tmpVolume.getName(),
+ null, null, tmpVolumeDataStore.getPhysicalSize(), tmpVolumeDataStore.getSize(),
+ Volume.class.getName(), tmpVolume.getUuid());
+
if (s_logger.isDebugEnabled()) {
s_logger.debug("Volume " + tmpVolume.getUuid() + " uploaded successfully");
}
@@ -389,6 +397,13 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto
_templateDao.update(tmpTemplate.getId(), templateUpdate);
stateMachine.transitTo(tmpTemplate, VirtualMachineTemplate.Event.OperationSucceeded, null, _templateDao);
_resourceLimitMgr.incrementResourceCount(template.getAccountId(), Resource.ResourceType.secondary_storage, answer.getVirtualSize());
+ //publish usage event
+ String etype = EventTypes.EVENT_TEMPLATE_CREATE;
+ if (tmpTemplate.getFormat() == Storage.ImageFormat.ISO) {
+ etype = EventTypes.EVENT_ISO_CREATE;
+ }
+ UsageEventUtils.publishUsageEvent(etype, tmpTemplate.getAccountId(), tmpTemplateDataStore.getDataStoreId(), tmpTemplate.getId(), tmpTemplate.getName(), null, null,
+ tmpTemplateDataStore.getPhysicalSize(), tmpTemplateDataStore.getSize(), VirtualMachineTemplate.class.getName(), tmpTemplate.getUuid());
if (s_logger.isDebugEnabled()) {
s_logger.debug("Template " + tmpTemplate.getUuid() + " uploaded successfully");