You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/08/13 10:25:32 UTC
[cloudstack] branch master updated (55a5470 -> b586eb2)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 55a5470 Merge remote-tracking branch 'origin/4.14'
add b586eb2 Human readable sizes in logs (#4207)
No new revisions were added by this update.
Summary of changes:
agent/src/main/java/com/cloud/agent/Agent.java | 3 +
.../api/command/user/volume/ResizeVolumeCmd.java | 13 ++-
.../java/com/cloud/agent/api/ReadyCommand.java | 8 +-
.../java/com/cloud/agent/transport/Request.java | 2 +
.../storage/template/HttpTemplateDownloader.java | 12 ++-
.../storage/template/S3TemplateDownloader.java | 9 +-
.../cloud/storage/template/TemplateLocation.java | 4 +-
.../com/cloud/storage/template/VmdkProcessor.java | 4 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 5 +-
.../engine/orchestration/VolumeOrchestrator.java | 5 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 12 +++
.../cloud/baremetal/manager/BareMetalPlanner.java | 3 +-
.../LibvirtBackupSnapshotCommandWrapper.java | 4 +-
.../wrapper/LibvirtResizeVolumeCommandWrapper.java | 8 +-
.../kvm/storage/KVMStorageProcessor.java | 13 +--
.../kvm/storage/LibvirtStorageAdaptor.java | 20 ++--
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 6 +-
.../hypervisor/vmware/resource/VmwareResource.java | 19 ++--
.../xenserver/resource/CitrixResourceBase.java | 14 +--
.../xenserver/resource/XcpServerResource.java | 6 +-
.../resource/XenServerStorageProcessor.java | 5 +-
.../resource/Xenserver625StorageProcessor.java | 4 +-
.../xenbase/CitrixResizeVolumeCommandWrapper.java | 4 +-
.../cluster/KubernetesClusterManagerImpl.java | 6 +-
...ernetesClusterResourceModifierActionWorker.java | 7 +-
.../driver/DateraPrimaryDataStoreDriver.java | 10 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 4 +-
.../manager/allocator/impl/FirstFitAllocator.java | 2 +-
.../allocator/impl/UserConcentratedAllocator.java | 4 +-
.../java/com/cloud/alert/ClusterAlertAdapter.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 27 ++++-
.../com/cloud/capacity/CapacityManagerImpl.java | 46 ++++-----
.../deploy/DeploymentPlanningManagerImpl.java | 4 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 2 +-
.../network/ExternalDeviceUsageManagerImpl.java | 10 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 18 ++--
.../resourcelimit/ResourceLimitManagerImpl.java | 27 ++++-
.../com/cloud/server/ManagementServerImpl.java | 6 +-
.../main/java/com/cloud/server/StatsCollector.java | 22 +++--
.../java/com/cloud/storage/StorageManagerImpl.java | 22 +++--
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 25 ++---
.../resource/NfsSecondaryStorageResource.java | 2 +-
.../storage/template/DownloadManagerImpl.java | 4 +-
.../storage/template/UploadManagerImpl.java | 4 +-
test/integration/smoke/test_certauthority_root.py | 7 +-
test/integration/smoke/test_human_readable_logs.py | 95 ++++++++++++++++++
.../com/cloud/test/stress/TestClientWithAPI.java | 6 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 38 +++----
.../com/cloud/usage/parser/NetworkUsageParser.java | 4 +-
.../com/cloud/usage/parser/StorageUsageParser.java | 6 +-
.../usage/parser/VMSanpshotOnPrimaryParser.java | 4 +-
.../cloud/usage/parser/VMSnapshotUsageParser.java | 4 +-
.../com/cloud/usage/parser/VmDiskUsageParser.java | 6 +-
.../java/com/cloud/utils/HumanReadableJson.java | 109 +++++++++++++++++++++
.../src/main/java/com/cloud/utils/NumbersUtil.java | 16 ++-
.../com/cloud/utils/HumanReadableJsonTest.java | 66 +++++++++++++
.../test/java/com/cloud/utils/NumbersUtilTest.java | 13 ++-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 4 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 4 +-
59 files changed, 626 insertions(+), 193 deletions(-)
create mode 100644 test/integration/smoke/test_human_readable_logs.py
create mode 100644 utils/src/main/java/com/cloud/utils/HumanReadableJson.java
create mode 100644 utils/src/test/java/com/cloud/utils/HumanReadableJsonTest.java