Alissa Bonas has uploaded a new change for review.
Change subject: core: rename methods in AsyncTaskManager to lowercase
......................................................................
core: rename methods in AsyncTaskManager to lowercase
Change-Id: If7a306df2d3eea086bf54c78dfc088ac0afff5ed
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandMultiAsyncTasks.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SPMAsyncTask.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java
11 files changed, 36 insertions(+), 47 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/20910/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
index b65abe1..13ef767 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AsyncTaskManager.java
@@ -125,10 +125,10 @@
@OnTimerMethodAnnotation("_timer_Elapsed")
public synchronized void _timer_Elapsed() {
- if (ThereAreTasksToPoll()) {
- PollAndUpdateAsyncTasks();
+ if (thereAreTasksToPoll()) {
+ pollAndUpdateAsyncTasks();
- if (ThereAreTasksToPoll() && logChangedMap) {
+ if (thereAreTasksToPoll() && logChangedMap) {
log.infoFormat("Finished polling Tasks, will poll again in {0}
seconds.",
Config.<Integer>GetValue(ConfigValues.AsyncTaskPollingRate));
@@ -159,7 +159,7 @@
* @return - true for uncached object , and false when the object should be
* cached.
*/
- public synchronized boolean CachingOver(SPMAsyncTask task) {
+ public synchronized boolean cachingOver(SPMAsyncTask task) {
// Get time in milliseconds that the task should be cached
long SubtractMinutesAsMills = TimeUnit.MINUTES
.toMillis(_cacheTimeInMinutes);
@@ -172,7 +172,7 @@
.currentTimeMillis() - SubtractMinutesAsMills);
}
- public synchronized boolean HasTasksByStoragePoolId(Guid storagePoolID) {
+ public synchronized boolean hasTasksByStoragePoolId(Guid storagePoolID) {
boolean retVal = false;
if (_tasks != null) {
for (SPMAsyncTask task : _tasks.values()) {
@@ -399,7 +399,7 @@
}
}
- private int NumberOfTasksToPoll() {
+ private int numberOfTasksToPoll() {
int retValue = 0;
for (SPMAsyncTask task : _tasks.values()) {
if (task.getShouldPoll()) {
@@ -410,7 +410,7 @@
return retValue;
}
- private boolean ThereAreTasksToPoll() {
+ private boolean thereAreTasksToPoll() {
for (SPMAsyncTask task : _tasks.values()) {
if (task.getShouldPoll()) {
return true;
@@ -423,10 +423,10 @@
* Fetch all tasks statuses from each storagePoolId , and update the _tasks
* map with the updated statuses.
*/
- private void PollAndUpdateAsyncTasks() {
+ private void pollAndUpdateAsyncTasks() {
if (logChangedMap) {
log.infoFormat("Polling and updating Async Tasks: {0} tasks, {1}
tasks to poll now",
- _tasks.size(), NumberOfTasksToPoll());
+ _tasks.size(), numberOfTasksToPoll());
}
// Fetch Set of pool id's
@@ -532,7 +532,7 @@
Set<Guid> poolsOfClearedAndOldTasks = new HashSet<Guid>();
ConcurrentMap<Guid, SPMAsyncTask> activeTaskMap = new
ConcurrentHashMap<Guid, SPMAsyncTask>();
for (SPMAsyncTask task : _tasks.values()) {
- if (!CachingOver(task)) {
+ if (!cachingOver(task)) {
activeTaskMap.put(task.getVdsmTaskId(), task);
poolsOfActiveTasks.add(task.getStoragePoolID());
} else {
@@ -617,17 +617,17 @@
log.infoFormat("Setting new tasks map. The map contains now {0}
tasks", _tasks.size());
}
- public SPMAsyncTask CreateTask(AsyncTaskType taskType, AsyncTaskParameters
taskParameters) {
+ public SPMAsyncTask createTask(AsyncTaskType taskType, AsyncTaskParameters
taskParameters) {
return AsyncTaskFactory.construct(taskType, taskParameters, false);
}
- public synchronized void StartPollingTask(Guid vdsmTaskId) {
+ public synchronized void startPollingTask(Guid vdsmTaskId) {
if (_tasks.containsKey(vdsmTaskId)) {
_tasks.get(vdsmTaskId).StartPollingTask();
}
}
- public synchronized ArrayList<AsyncTaskStatus>
PollTasks(java.util.ArrayList<Guid> vdsmTaskIdList) {
+ public synchronized ArrayList<AsyncTaskStatus>
pollTasks(java.util.ArrayList<Guid> vdsmTaskIdList) {
ArrayList<AsyncTaskStatus> returnValue = new
ArrayList<AsyncTaskStatus>();
if (vdsmTaskIdList != null && vdsmTaskIdList.size() > 0) {
@@ -660,7 +660,7 @@
*
* @param sp the storage pool to retrieve running tasks from
*/
- public void AddStoragePoolExistingTasks(StoragePool sp) {
+ public void addStoragePoolExistingTasks(StoragePool sp) {
List<AsyncTaskCreationInfo> currPoolTasks = null;
try {
currPoolTasks = (ArrayList<AsyncTaskCreationInfo>)
Backend.getInstance().getResourceManager()
@@ -717,7 +717,7 @@
});
for (SPMAsyncTask task : newlyAddedTasks) {
- StartPollingTask(task.getVdsmTaskId());
+ startPollingTask(task.getVdsmTaskId());
}
log.infoFormat(
@@ -753,13 +753,13 @@
*
* @param vdsmTaskList - List of tasks to stop.
*/
- public synchronized void CancelTasks(List<Guid> vdsmTaskList) {
+ public synchronized void cancelTasks(List<Guid> vdsmTaskList) {
for (Guid vdsmTaskId : vdsmTaskList) {
- CancelTask(vdsmTaskId);
+ cancelTask(vdsmTaskId);
}
}
- public synchronized void CancelTask(Guid vdsmTaskId) {
+ public synchronized void cancelTask(Guid vdsmTaskId) {
if (_tasks.containsKey(vdsmTaskId)) {
log.infoFormat("Attempting to cancel task '{0}'.", vdsmTaskId);
_tasks.get(vdsmTaskId).stopTask();
@@ -767,23 +767,12 @@
}
}
- public synchronized boolean EntityHasTasks(Guid id) {
+ public synchronized boolean entityHasTasks(Guid id) {
for (SPMAsyncTask task : _tasks.values()) {
if (isCurrentTaskLookedFor(id, task)) {
return true;
}
}
- return false;
- }
-
- public synchronized boolean StoragePoolHasUnclearedTasks(Guid
storagePoolId) {
- for (SPMAsyncTask task : _tasks.values()) {
- if (task.getState() != AsyncTaskState.Cleared && task.getState()
!= AsyncTaskState.ClearFailed
- && task.getStoragePoolID().equals(storagePoolId)) {
- return true;
- }
- }
-
return false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index c7d6414..aeeb895 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -1544,7 +1544,7 @@
try {
return createTaskImpl(taskId, asyncTaskCreationInfo,
parentCommand, description, entitiesMap);
} catch (RuntimeException ex) {
- log.errorFormat("Error during CreateTask for command: {0}.
Exception {1}", getClass().getName(), ex);
+ log.errorFormat("Error during createTask for command: {0}.
Exception {1}", getClass().getName(), ex);
} finally {
TransactionSupport.resume(transaction);
}
@@ -1680,7 +1680,7 @@
protected void startPollingAsyncTasks(Collection<Guid> taskIds) {
for (Guid taskID : taskIds) {
- getAsyncTaskManager().StartPollingTask(taskID);
+ getAsyncTaskManager().startPollingTask(taskID);
}
}
@@ -1713,7 +1713,7 @@
public void run() {
log.infoFormat("Rollback for command: {0}.",
CommandBase.this.getClass().getName());
try {
-
getAsyncTaskManager().CancelTasks(getReturnValue().getVdsmTaskIdList());
+
getAsyncTaskManager().cancelTasks(getReturnValue().getVdsmTaskIdList());
} catch (Exception e) {
log.errorFormat("Failed to cancel tasks for command:
{0}.",
CommandBase.this.getClass().getName());
@@ -1725,12 +1725,12 @@
protected void revertTasks() {
if (getParameters().getVdsmTaskIds() != null) {
- // list to send to the PollTasks method
+ // list to send to the pollTasks method
ArrayList<Guid> taskIdAsList = new ArrayList<Guid>();
for (Guid taskId : getParameters().getVdsmTaskIds()) {
taskIdAsList.add(taskId);
- ArrayList<AsyncTaskStatus> tasksStatuses =
getAsyncTaskManager().PollTasks(
+ ArrayList<AsyncTaskStatus> tasksStatuses =
getAsyncTaskManager().pollTasks(
taskIdAsList);
// call revert task only if ended successfully
if (tasksStatuses.get(0).getTaskEndedSuccessfully()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandMultiAsyncTasks.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandMultiAsyncTasks.java
index d6087a5..00012eb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandMultiAsyncTasks.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandMultiAsyncTasks.java
@@ -156,7 +156,7 @@
}
} else {
log.warnFormat(
- "CommandMultiAsyncTasks::StartPollingTask: For some
reason, task '{0}' has no parameters or no DB task - we don't know its action
type",
+ "CommandMultiAsyncTasks::startPollingTask: For some
reason, task '{0}' has no parameters or no DB task - we don't know its action
type",
TaskID);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java
index 84f8468..e4bc83b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTasksStatusesByTasksIDsQuery.java
@@ -10,6 +10,6 @@
@Override
protected void executeQueryCommand() {
-
getQueryReturnValue().setReturnValue(AsyncTaskManager.getInstance().PollTasks(getParameters().getTasksIDs()));
+
getQueryReturnValue().setReturnValue(AsyncTaskManager.getInstance().pollTasks(getParameters().getTasksIDs()));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
index d9239f5..c371611 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
@@ -247,7 +247,7 @@
if (vmStatus != VMStatus.Up) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_UP);
}
- if (AsyncTaskManager.getInstance().EntityHasTasks(getVmId())) {
+ if (AsyncTaskManager.getInstance().entityHasTasks(getVmId())) {
return
failCanDoAction(VdcBllMessages.VM_CANNOT_SUSPENDE_HAS_RUNNING_TASKS);
}
// check if vm has stateless images in db in case vm was run once as
stateless
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
index 64a7cb0..8a7aef7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
@@ -219,7 +219,7 @@
}
// If it is force, we cannot remove if there are task
- if
(AsyncTaskManager.getInstance().HasTasksByStoragePoolId(getVm().getStoragePoolId()))
{
+ if
(AsyncTaskManager.getInstance().hasTasksByStoragePoolId(getVm().getStoragePoolId()))
{
return
failCanDoAction(VdcBllMessages.VM_CANNOT_REMOVE_HAS_RUNNING_TASKS);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
index ea74927..e162866 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
@@ -197,7 +197,7 @@
ExecutionHandler.createDefaultContexForTasks(getExecutionContext()));
for (Guid taskId : vdcRetValue.getInternalVdsmTaskIdList()) {
- AsyncTaskManager.getInstance().StartPollingTask(taskId);
+ AsyncTaskManager.getInstance().startPollingTask(taskId);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SPMAsyncTask.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SPMAsyncTask.java
index 76eb657..a751649 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SPMAsyncTask.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SPMAsyncTask.java
@@ -116,7 +116,7 @@
if (state != AsyncTaskState.AttemptingEndAction
&& state != AsyncTaskState.Cleared
&& state != AsyncTaskState.ClearFailed) {
- log.infoFormat("BaseAsyncTask::StartPollingTask: Starting to poll
task '{0}'.", getVdsmTaskId());
+ log.infoFormat("BaseAsyncTask::startPollingTask: Starting to poll
task '{0}'.", getVdsmTaskId());
ConcreteStartPollingTask();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
index 7a13950..c8a1610 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
@@ -249,7 +249,7 @@
@Override
public void storagePoolUpEvent(StoragePool storagePool) {
-
AsyncTaskManager.getInstance().AddStoragePoolExistingTasks(storagePool);
+
AsyncTaskManager.getInstance().addStoragePoolExistingTasks(storagePool);
}
@Override
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
index d602426..a5dca79 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
@@ -301,7 +301,7 @@
if (!vdsRetValue.getSucceeded()) {
if (startPollingTasks) {
- AsyncTaskManager.getInstance().StartPollingTask(guid1);
+ AsyncTaskManager.getInstance().startPollingTask(guid1);
}
return false;
}
@@ -310,8 +310,8 @@
getTaskIdList().add(guid2);
if (startPollingTasks) {
- AsyncTaskManager.getInstance().StartPollingTask(guid1);
- AsyncTaskManager.getInstance().StartPollingTask(guid2);
+ AsyncTaskManager.getInstance().startPollingTask(guid1);
+ AsyncTaskManager.getInstance().startPollingTask(guid2);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java
index f876fbc..46ce07f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java
@@ -82,11 +82,11 @@
if (startPollingTasks) {
if (!Guid.Empty.equals(memoryImageRemovalTaskId)) {
-
AsyncTaskManager.getInstance().StartPollingTask(memoryImageRemovalTaskId);
+
AsyncTaskManager.getInstance().startPollingTask(memoryImageRemovalTaskId);
}
if (confImageRemovalTaskId != null &&
!Guid.Empty.equals(confImageRemovalTaskId)) {
-
AsyncTaskManager.getInstance().StartPollingTask(confImageRemovalTaskId);
+
AsyncTaskManager.getInstance().startPollingTask(confImageRemovalTaskId);
}
}
--
To view, visit http://gerrit.ovirt.org/20910
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7a306df2d3eea086bf54c78dfc088ac0afff5ed
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
