Skip to content

Allow counters to be created with same name, provider and source as a deleted one #10223

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

Open
wants to merge 9 commits into
base: 4.20
Choose a base branch
from
Open

Allow counters to be created with same name, provider and source as a deleted one #10223

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
294696d
Allow counters to be created with same name, provider and source as d…
Pearl1594 Jan 21, 2025
fdb9a71
fix api response
Pearl1594 Jan 21, 2025
7a1e54d
drop unique key only if it exists
Pearl1594 Jan 22, 2025
2ace4dd
create a procedure
Pearl1594 Jan 22, 2025
96691f6
Merge branch '4.19' into fix-create-counters-dup
DaanHoogland Jan 30, 2025
6b5ece3
Update engine/schema/src/main/resources/META-INF/db/schema-41910to419…
DaanHoogland Jan 30, 2025
e80c713
Merge branch '4.20' of https://github.com/apache/cloudstack into fix-…
Pearl1594 Feb 25, 2025
1ee387d
move query to 4.20.1 schema file
Pearl1594 Feb 25, 2025
11f1217
prevent addition of counters with same name, provider and source as a…
Pearl1594 Feb 25, 2025
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: 2 additions & 0 deletions api/src/main/java/com/cloud/network/as/AutoScaleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public interface AutoScaleService {

Counter createCounter(CreateCounterCmd cmd);

Counter getCounter(long counterId);

boolean deleteCounter(long counterId) throws ResourceInUseException;

List<? extends Counter> listCounters(ListCountersCmd cmd);
Expand Down
9 changes: 6 additions & 3 deletions api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.cloudstack.api.command.admin.autoscale;

import org.apache.cloudstack.context.CallContext;
import org.apache.log4j.Logger;

import org.apache.cloudstack.api.APICommand;
Expand Down Expand Up @@ -91,16 +92,18 @@
if (ctr != null) {
this.setEntityId(ctr.getId());
this.setEntityUuid(ctr.getUuid());
CounterResponse response = _responseGenerator.createCounterResponse(ctr);
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create Counter with name " + getName());
}
}

@Override
public void execute() {
CallContext.current().setEventDetails("Guest OS Id: " + getEntityId());
Counter ctr = _autoScaleService.getCounter(getEntityId());
CounterResponse response = _responseGenerator.createCounterResponse(ctr);
response.setResponseName(getCommandName());
this.setResponseObject(response);

Check warning on line 106 in api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java#L102-L106 

Added lines #L102 - L106 were not covered by tests
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@

-- Add last_id to the volumes table
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.volumes', 'last_id', 'bigint(20) unsigned DEFAULT NULL');

ALTER TABLE `cloud`.`counter` DROP KEY `uc_counter__provider__source__value`;
CALL `cloud`.`IDEMPOTENT_ADD_UNIQUE_KEY`('cloud.counter', 'uc_counter__provider__source__value_removed', '(provider, source, value, removed)');
6 changes: 6 additions & 0 deletions server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,6 +1474,12 @@
return counter;
}

@Override
@ActionEvent(eventType = EventTypes.EVENT_COUNTER_CREATE, eventDescription = "Creating a counter", async = true)
public Counter getCounter(long counterId) {
return counterDao.findById(counterId);
}

Check warning on line 1481 in server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java#L1479-L1481 

Added lines #L1479 - L1481 were not covered by tests

@Override
@ActionEvent(eventType = EventTypes.EVENT_CONDITION_CREATE, eventDescription = "Condition", create = true)
public Condition createCondition(CreateConditionCmd cmd) {
Expand Down
Loading