Skip to content

CLOUDSTACK-10188 - Resource Accounting for primary storage is Broken when Domains are in use #2362

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

Merged
yadvr merged 9 commits into from
Jan 10, 2018
Merged

CLOUDSTACK-10188 - Resource Accounting for primary storage is Broken when Domains are in use #2362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
12cb54d
CLOUDSTACK-10140 Fixed
bwsw Nov 13, 2017
d5fe9bf
Merge branch 'master' of https://github.com/bwsw/cloudstack
Dec 4, 2017
fd38223
CLOUDSTACK-10188
Dec 17, 2017
ad47b2e
Merge branch 'master' of https://github.com/bwsw/cloudstack
Dec 26, 2017
5f6a5cc
Merge branch 'master' of https://github.com/bwsw/cloudstack
bwsw Dec 26, 2017
f286f09
Merge branch 'master' into CLOUDSTACK-10188-2
bwsw Dec 26, 2017
b0bcd33
Merge branch 'master' of https://github.com/bwsw/cloudstack
bwsw Jan 7, 2018
c020e71
Merge branch 'master' into CLOUDSTACK-10188-2
bwsw Jan 7, 2018
7abf855
Merge branch 'master' into CLOUDSTACK-10188-2
bwsw Jan 8, 2018
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
2 changes: 1 addition & 1 deletion api/src/com/cloud/user/ResourceLimitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
public interface ResourceLimitService {

static final ConfigKey<Long> ResourceCountCheckInterval = new ConfigKey<Long>("Advanced", Long.class, "resourcecount.check.interval", "300",
"Time (in seconds) to wait before retrying resource count check task. Default is 300, Setting this to 0 will not run the task", false);
"Time (in seconds) to wait before running resource recalculation and fixing task. Default is 300 seconds, Setting this to 0 disables execution of the task", false);

/**
* Updates an existing resource limit with the specified details. If a limit doesn't exist, will create one.
Expand Down
3 changes: 1 addition & 2 deletions engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,8 +1571,7 @@ public void destroyVolume(Volume volume) {
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(),
Volume.class.getName(), volume.getUuid(), volume.isDisplayVolume());
_resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.volume, volume.isDisplay());
//FIXME - why recalculate and not decrement
_resourceLimitMgr.recalculateResourceCount(volume.getAccountId(), volume.getDomainId(), ResourceType.primary_storage.getOrdinal());
_resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.primary_storage, volume.isDisplay(), new Long(volume.getSize()));
} catch (Exception e) {
s_logger.debug("Failed to destroy volume" + volume.getId(), e);
throw new CloudRuntimeException("Failed to destroy volume" + volume.getId(), e);
Expand Down
Loading