MAAS

Merge ~ltrager/maas:lp1726534 into maas:master

  1. Git
  2. lp:~ltrager/maas
  3. lp1726534
  4. Merge into master
Proposed by Lee Trager
Status: Merged
Approved by: Newell Jensen
Approved revision: e2bdcff161e9cdb81862d70abb04d2275eac7dd3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:lp1726534
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/metadataserver/builtin_scripts/fio.py (+1/-1)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
MAAS Lander Approve
Review via email: mp+332956@code.launchpad.net

Commit message

LP: #1726534 - Fio sometimes contains a '.' in its output

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1726534 lp:~ltrager/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e2bdcff161e9cdb81862d70abb04d2275eac7dd3

review: Approve
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/metadataserver/builtin_scripts/fio.py b/src/metadataserver/builtin_scripts/fio.py
2index 0cb5204..6c36caa 100644
3--- a/src/metadataserver/builtin_scripts/fio.py
4+++ b/src/metadataserver/builtin_scripts/fio.py
5@@ -79,7 +79,7 @@ CMD = [
6 '--iodepth=64', '--size=4G'
7 ]
8
9-REGEX = b"bw=([0-9]+[a-zA-Z]+/s), iops=([0-9]+)"
10+REGEX = b"bw=([0-9\.]+[a-zA-Z]+/s),\siops=([0-9]+)"
11
12
13 def run_cmd(cmd):

Subscribers

People subscribed via source and target branches