Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 04676200B29 for ; Thu, 26 May 2016 04:54:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 01BBB160A29; Thu, 26 May 2016 02:54:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6F7EE160A34 for ; Thu, 26 May 2016 04:54:43 +0200 (CEST) Received: (qmail 32378 invoked by uid 500); 26 May 2016 02:54:42 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 32204 invoked by uid 99); 26 May 2016 02:54:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2016 02:54:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 519A5DFF8E; Thu, 26 May 2016 02:54:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Thu, 26 May 2016 02:54:44 -0000 Message-Id: In-Reply-To: <76205e78065a4a3bab0b6a5a49298290@git.apache.org> References: <76205e78065a4a3bab0b6a5a49298290@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: updated refs/heads/master to 678b28f archived-at: Thu, 26 May 2016 02:54:44 -0000 Merge pull request #1410 from ustcweizhou/CLOUDSTACK-6928-io-throttling CLOUDSTACK-6928: fix issue disk I/O throttling not appliedDisk IO throttling (for KVM) is not applied in the merge of 4.2. Tests passed: (1) start vm (2) attach volume (3) start vm with volume (4) migrate vm (with volume) * pr/1410: CLOUDSTACK-6928: fix issue disk I/O throttling not applied Signed-off-by: Will Stevens Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/82f1198e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/82f1198e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/82f1198e Branch: refs/heads/master Commit: 82f1198ee60958025d9aa3e774b7ca65d2de2bfa Parents: 74f60df 976b3b7 Author: Will Stevens Authored: Wed May 25 22:51:37 2016 -0400 Committer: Will Stevens Committed: Wed May 25 22:51:38 2016 -0400 ---------------------------------------------------------------------- .../src/com/cloud/storage/StorageManager.java | 137 +++++++++++++++++++ .../orchestration/VolumeOrchestrator.java | 20 ++- .../kvm/storage/KVMStorageProcessor.java | 21 ++- .../src/com/cloud/storage/StorageManager.java | 128 ----------------- .../com/cloud/storage/StorageManagerImpl.java | 53 ++++++- .../com/cloud/storage/VolumeApiServiceImpl.java | 5 +- 6 files changed, 221 insertions(+), 143 deletions(-) ----------------------------------------------------------------------