You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/07/11 07:35:45 UTC
[1/2] git commit: updated refs/heads/4.2 to b5cf351
Updated Branches:
refs/heads/4.2 8eac039d8 -> b5cf3510e
CLOUDSTACK-1047: tracking in logs using job id.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ac8f2b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ac8f2b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ac8f2b4
Branch: refs/heads/4.2
Commit: 2ac8f2b4525d664c9e44a9846cd688020df5cc72
Parents: 8eac039
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Mon Jun 17 17:01:39 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Thu Jul 11 10:57:13 2013 +0530
----------------------------------------------------------------------
.../com/cloud/async/AsyncJobManagerImpl.java | 134 +++++++++++--------
.../com/cloud/storage/VolumeManagerImpl.java | 8 +-
2 files changed, 81 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ac8f2b4/server/src/com/cloud/async/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java
index 602bd85..cc82c26 100644
--- a/server/src/com/cloud/async/AsyncJobManagerImpl.java
+++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java
@@ -212,7 +212,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
job.setSyncSource(null);
scheduleExecution(job, scheduleJobExecutionInContext);
if(s_logger.isDebugEnabled()) {
- s_logger.debug("submit async job-" + job.getId() + ", details: " + job.toString());
+ s_logger.debug("submit async job-" + job.getId() + " = [ " + job.getUuid() + " ], details: " + job.toString());
}
publishOnEventBus(job, "submit");
return job.getId();
@@ -226,25 +226,25 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
@Override @DB
public void completeAsyncJob(long jobId, int jobStatus, int resultCode, Object resultObject) {
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("Complete async job-" + jobId + ", jobStatus: " + jobStatus +
- ", resultCode: " + resultCode + ", result: " + resultObject);
+ AsyncJobVO job = _jobDao.findById(jobId);
+ String jobUuid = null;
+ if (job != null) {
+ jobUuid = job.getUuid();
+ if(s_logger.isDebugEnabled()) {
+ s_logger.debug("Complete async job-" + jobId + " = [ " + jobUuid + " ], jobStatus: " + jobStatus +
+ ", resultCode: " + resultCode + ", result: " + resultObject);
+ }
+ } else {
+ if(s_logger.isDebugEnabled()) {
+ s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus +
+ ", resultCode: " + resultCode + ", result: " + resultObject);
+ }
+ return;
}
Transaction txt = Transaction.currentTxn();
try {
txt.start();
- AsyncJobVO job = _jobDao.findById(jobId);
- if(job == null) {
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus +
- ", resultCode: " + resultCode + ", result: " + resultObject);
- }
-
- txt.rollback();
- return;
- }
-
job.setCompleteMsid(getMsid());
job.setStatus(jobStatus);
job.setResultCode(resultCode);
@@ -263,31 +263,31 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
_jobDao.update(jobId, job);
txt.commit();
} catch(Exception e) {
- s_logger.error("Unexpected exception while completing async job-" + jobId, e);
+ s_logger.error("Unexpected exception while completing async job-" + jobId + " = [ " + jobUuid + " ]", e);
txt.rollback();
}
}
@Override @DB
public void updateAsyncJobStatus(long jobId, int processStatus, Object resultObject) {
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("Update async-job progress, job-" + jobId + ", processStatus: " + processStatus +
- ", result: " + resultObject);
+ AsyncJobVO job = _jobDao.findById(jobId);
+ String jobUuid = null;
+ if (job != null) {
+ jobUuid = job.getUuid();
+ if(s_logger.isDebugEnabled()) {
+ s_logger.debug("Update async-job progress, job-" + jobId + " = [ " + jobUuid + " ], processStatus: " + processStatus +
+ ", result: " + resultObject);
+ }
+ } else {
+ if(s_logger.isDebugEnabled()) {
+ s_logger.debug("job-" + jobId + " no longer exists, we just log progress info here. progress status: " + processStatus);
+ }
+ return;
}
Transaction txt = Transaction.currentTxn();
try {
txt.start();
- AsyncJobVO job = _jobDao.findById(jobId);
- if(job == null) {
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("job-" + jobId + " no longer exists, we just log progress info here. progress status: " + processStatus);
- }
-
- txt.rollback();
- return;
- }
-
job.setProcessStatus(processStatus);
if(resultObject != null) {
job.setResult(ApiSerializerHelper.toSerializedStringOld(resultObject));
@@ -297,23 +297,32 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
publishOnEventBus(job, "update");
txt.commit();
} catch(Exception e) {
- s_logger.error("Unexpected exception while updating async job-" + jobId + " status: ", e);
+ s_logger.error("Unexpected exception while updating async job-" + jobId + " = [ " + jobUuid + " ] status: ", e);
txt.rollback();
}
}
@Override @DB
public void updateAsyncJobAttachment(long jobId, String instanceType, Long instanceId) {
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("Update async-job attachment, job-" + jobId + ", instanceType: " + instanceType +
- ", instanceId: " + instanceId);
+ AsyncJobVO job = _jobDao.findById(jobId);
+ String jobUuid = null;
+ if (job != null) {
+ jobUuid = job.getUuid();
+ if(s_logger.isDebugEnabled()) {
+ s_logger.debug("Update async-job attachment, job-" + jobId + " = [ " + jobUuid + " ], instanceType: "
+ + instanceType + ", instanceId: " + instanceId);
+ }
+ } else {
+ if(s_logger.isDebugEnabled()) {
+ s_logger.debug("job-" + jobId + " no longer exists, instanceType: " + instanceType + ", instanceId: "
+ + instanceId);
+ }
+ return;
}
Transaction txt = Transaction.currentTxn();
try {
txt.start();
-
- AsyncJobVO job = _jobDao.createForUpdate();
//job.setInstanceType(instanceType);
job.setInstanceId(instanceId);
job.setLastUpdated(DateUtil.currentGMTTime());
@@ -321,7 +330,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
txt.commit();
} catch(Exception e) {
- s_logger.error("Unexpected exception while updating async job-" + jobId + " attachment: ", e);
+ s_logger.error("Unexpected exception while updating async job-" + jobId + " = [ " + jobUuid + " ] attachment: ", e);
txt.rollback();
}
}
@@ -338,7 +347,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
}
if(s_logger.isDebugEnabled()) {
- s_logger.debug("Sync job-" + job.getId() + " execution on object " + syncObjType + "." + syncObjId);
+ s_logger.debug("Sync job-" + job.getId() + " = [ " + job.getUuid() + " ] execution on object " + syncObjType + "." + syncObjId);
}
SyncQueueVO queue = null;
@@ -362,7 +371,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
if (queue == null) {
throw new CloudRuntimeException("Unable to insert queue item into database, DB is full?");
} else {
- throw new AsyncCommandQueued(queue, "job-" + job.getId() + " queued");
+ throw new AsyncCommandQueued(queue, "job-" + job.getId() + " = [ " + job.getUuid() + " ] queued");
}
}
@@ -382,7 +391,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
//regular user can see only jobs he owns
if (caller.getId() != jobOwner.getId()) {
- throw new PermissionDeniedException("Account " + caller + " is not authorized to see job id=" + job.getId());
+ throw new PermissionDeniedException("Account " + caller + " is not authorized to see job-" + job.getId() + " = [ " + job.getUuid() + " ]");
}
} else if (caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
_accountMgr.checkAccess(caller, null, true, jobOwner);
@@ -395,8 +404,17 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
@Override @DB
public AsyncJobResult queryAsyncJobResult(long jobId) {
- if(s_logger.isTraceEnabled()) {
- s_logger.trace("Query async-job status, job-" + jobId);
+ AsyncJobVO job = _jobDao.findById(jobId);
+ String jobUuid = null;
+ if (job != null) {
+ jobUuid = job.getUuid();
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace("Query async-job status, job-" + jobId + " = [ " + jobUuid + " ]");
+ }
+ } else {
+ if(s_logger.isDebugEnabled()) {
+ s_logger.debug("Async job-" + jobId + " does not exist, invalid job id?");
+ }
}
Transaction txt = Transaction.currentTxn();
@@ -404,7 +422,6 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
try {
txt.start();
- AsyncJobVO job = _jobDao.findById(jobId);
if(job != null) {
jobResult.setCmdOriginator(job.getCmdOriginator());
jobResult.setJobStatus(job.getStatus());
@@ -417,23 +434,23 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
job.getStatus() == AsyncJobResult.STATUS_FAILED) {
if(s_logger.isDebugEnabled()) {
- s_logger.debug("Async job-" + jobId + " completed");
+ s_logger.debug("Async job-" + jobId + " = [ " + jobUuid + " ] completed");
}
} else {
job.setLastPolled(DateUtil.currentGMTTime());
_jobDao.update(jobId, job);
}
} else {
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("Async job-" + jobId + " does not exist, invalid job id?");
- }
-
jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED);
jobResult.setResult("job-" + jobId + " does not exist");
}
txt.commit();
} catch(Exception e) {
- s_logger.error("Unexpected exception while querying async job-" + jobId + " status: ", e);
+ if (jobUuid == null) {
+ s_logger.error("Unexpected exception while querying async job-" + jobId + " status: ", e);
+ } else {
+ s_logger.error("Unexpected exception while querying async job-" + jobId + " = [ " + jobUuid + " ] status: ", e);
+ }
jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED);
jobResult.setResult("Exception: " + e.toString());
@@ -470,17 +487,18 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
try {
JmxUtil.registerMBean("AsyncJobManager", "Active Job " + job.getId(), new AsyncJobMBeanImpl(job));
} catch(Exception e) {
- s_logger.warn("Unable to register active job " + job.getId() + " to JMX monitoring due to exception " + ExceptionUtil.toString(e));
+ s_logger.warn("Unable to register active job [ " + job.getId() + " ] = [ " + job.getUuid() + " ] to JMX monitoring due to exception " + ExceptionUtil.toString(e));
}
BaseAsyncCmd cmdObj = null;
Transaction txn = Transaction.open(Transaction.CLOUD_DB);
try {
jobId = job.getId();
- NDC.push("job-" + jobId);
+ String jobUuid = job.getUuid();
+ NDC.push("job-" + jobId + " = [ " + jobUuid + " ]");
if(s_logger.isDebugEnabled()) {
- s_logger.debug("Executing " + job.getCmd() + " for job-" + jobId);
+ s_logger.debug("Executing " + job.getCmd() + " for job-" + jobId + " = [ " + jobUuid + " ]");
}
Class<?> cmdClass = Class.forName(job.getCmd());
@@ -525,13 +543,13 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
}
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Done executing " + job.getCmd() + " for job-" + jobId);
+ s_logger.debug("Done executing " + job.getCmd() + " for job-" + job.getId() + " = [ " + jobUuid + " ]");
}
} catch(Throwable e) {
if (e instanceof AsyncCommandQueued) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("job " + job.getCmd() + " for job-" + jobId + " was queued, processing the queue.");
+ s_logger.debug("job " + job.getCmd() + " for job-" + jobId + " = [ " + job.getUuid() + " ] was queued, processing the queue.");
}
checkQueue(((AsyncCommandQueued)e).getQueue().getId());
} else {
@@ -570,7 +588,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
try {
JmxUtil.unregisterMBean("AsyncJobManager", "Active Job " + job.getId());
} catch(Exception e) {
- s_logger.warn("Unable to unregister active job " + job.getId() + " from JMX monitoring");
+ s_logger.warn("Unable to unregister active job [ " + job.getId() + " ] = [ " + job.getUuid() + " ] from JMX monitoring");
}
txn.close();
@@ -587,10 +605,12 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
}
private void executeQueueItem(SyncQueueItemVO item, boolean fromPreviousSession) {
+ long jobId = item.getContentId();
AsyncJobVO job = _jobDao.findById(item.getContentId());
if (job != null) {
+ String jobUuid = job.getUuid();
if(s_logger.isDebugEnabled()) {
- s_logger.debug("Schedule queued job-" + job.getId());
+ s_logger.debug("Schedule queued job-" + jobId + " = [ " + jobUuid + " ]");
}
job.setFromPreviousSession(fromPreviousSession);
@@ -602,7 +622,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
try {
scheduleExecution(job);
} catch(RejectedExecutionException e) {
- s_logger.warn("Execution for job-" + job.getId() + " is rejected, return it to the queue for next turn");
+ s_logger.warn("Execution for job-" + jobId + " = [ " + jobUuid + " ] is rejected, return it to the queue for next turn");
_queueMgr.returnItem(item.getId());
}
@@ -619,7 +639,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
public void releaseSyncSource(AsyncJobExecutor executor) {
if(executor.getSyncSource() != null) {
if(s_logger.isDebugEnabled()) {
- s_logger.debug("Release sync source for job-" + executor.getJob().getId() + " sync source: "
+ s_logger.debug("Release sync source for job-" + executor.getJob().getId() + " = [ " + executor.getJob().getUuid() + " ] sync source: "
+ executor.getSyncSource().getContentType() + "-"
+ executor.getSyncSource().getContentId());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ac8f2b4/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
index e25b88e..ca2f7ac 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -1872,8 +1872,8 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager {
if (s_logger.isInfoEnabled()) {
s_logger.info("Trying to attaching volume " + volumeId
+ " to vm instance:" + vm.getId()
- + ", update async job-" + job.getId()
- + " progress status");
+ + ", update async job-" + job.getId() + " = [ " + job.getUuid()
+ + " ] progress status");
}
_asyncMgr.updateAsyncJobAttachment(job.getId(), "volume", volumeId);
@@ -1979,8 +1979,8 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager {
if (s_logger.isInfoEnabled()) {
s_logger.info("Trying to attaching volume " + volumeId
+ "to vm instance:" + vm.getId()
- + ", update async job-" + job.getId()
- + " progress status");
+ + ", update async job-" + job.getId() + " = [ " + job.getUuid()
+ + " ] progress status");
}
_asyncMgr.updateAsyncJobAttachment(job.getId(), "volume", volumeId);
[2/2] git commit: updated refs/heads/4.2 to b5cf351
Posted by de...@apache.org.
CLOUDSTACK-1960: Fix for UK Keyboard - Bar symbol i.e. "|".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b5cf3510
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5cf3510
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5cf3510
Branch: refs/heads/4.2
Commit: b5cf3510eb01b8b81f3437eaebbb4a6ede0f55bc
Parents: 2ac8f2b
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Jul 3 17:05:22 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Thu Jul 11 10:57:22 2013 +0530
----------------------------------------------------------------------
services/console-proxy/server/js/ajaxkeys.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5cf3510/services/console-proxy/server/js/ajaxkeys.js
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/js/ajaxkeys.js b/services/console-proxy/server/js/ajaxkeys.js
index 677962b..725c8c5 100644
--- a/services/console-proxy/server/js/ajaxkeys.js
+++ b/services/console-proxy/server/js/ajaxkeys.js
@@ -321,6 +321,10 @@ var keyboardTables = [
{keycode: 92, entry:
[{type : KEY_DOWN, code : 0xa6, modifiers : 0, shift : false}]
},
+ // [124 = |]
+ {keycode: 124, entry:
+ [{type : KEY_DOWN, code : 0xa6, modifiers : 64, shift : true}]
+ },
// [126 = ~]
{keycode: 126, entry:
[{type : KEY_DOWN, code : 0x7c, modifiers : 64, shift : true}]