重新调整磁盘性能限额配置

api/config.py

@@ -70,14 +70,14 @@ def r_create():
     config.dns1 = request.json.get('dns1')
     config.dns2 = request.json.get('dns2')
     config.iops_base = int(request.json.get('iops_base', 1000))
-    config.iops_pre_unit = int(request.json.get('iops_pre_unit', 6))
+    config.iops_pre_unit = int(request.json.get('iops_pre_unit', 1))
     config.iops_cap = int(request.json.get('iops_cap', 2000))
     config.iops_max = int(request.json.get('iops_max', 3000))
     config.iops_max_length = int(request.json.get('iops_max_length', 20))
     # 200 MiB
     config.bps_base = int(request.json.get('bps_base', 1024 * 1024 * 200))
-    # 0.1 MiB
-    config.bps_pre_unit = int(request.json.get('bps_pre_unit', 1024 * 1024 / 10))
+    # 0.3 MiB
+    config.bps_pre_unit = int(request.json.get('bps_pre_unit', 1024 * 1024 * 0.3))
     # 500 MiB
     config.bps_cap = int(request.json.get('bps_cap', 1024 * 1024 * 500))
     # 1 GiB

templates/config_init.html

@@ -45,14 +45,14 @@
 
         if (hdd_type === 'sas') {
             $('#iops_base').val('1000');
-            $('#iops_pre_unit').val('6');
+            $('#iops_pre_unit').val('1');
             $('#iops_cap').val('2000');
             $('#iops_max').val('3000');
             $('#iops_max_length').val('20');
             // 200 MiB
             $('#bps_base').val('209715200');
-            // 0.1 MiB
-            $('#bps_pre_unit').val('104857');
+            // 0.3 MiB
+            $('#bps_pre_unit').val('314572');
             // 500 MiB
             $('#bps_cap').val('524288000');
             // 1 GiB
@@ -66,7 +66,8 @@
             $('#iops_max').val('20000');
             $('#iops_max_length').val('20');
             $('#bps_base').val('209715200');
-            $('#bps_pre_unit').val('104857');
+            // 1 MiB
+            $('#bps_pre_unit').val('1048576');
             $('#bps_cap').val('524288000');
             $('#bps_max').val('1073741824');
             $('#bps_max_length').val('10')
@@ -175,12 +176,12 @@
                                 <label>SSD<input class="form-control" name="hdd_type" type="radio" value="ssd" onclick="hdd_type_select(this)" /></label>
                             </div>
                                 <input class="form-control" id="iops_base" name="iops_base" type="hidden" value="1000" />
-                                <input class="form-control" id="iops_pre_unit" name="iops_pre_unit" type="hidden" value="6" />
+                                <input class="form-control" id="iops_pre_unit" name="iops_pre_unit" type="hidden" value="1" />
                                 <input class="form-control" id="iops_cap" name="iops_cap" type="hidden" value="2000" />
                                 <input class="form-control" id="iops_max" name="iops_max" type="hidden" value="3000" />
                                 <input class="form-control" id="iops_max_length" name="iops_max_length" type="hidden" value="20" />
                                 <input class="form-control" id="bps_base" name="bps_base" type="hidden" value="209715200" />
-                                <input class="form-control" id="bps_pre_unit" name="bps_pre_unit" type="hidden" value="104857" />
+                                <input class="form-control" id="bps_pre_unit" name="bps_pre_unit" type="hidden" value="314572" />
                                 <input class="form-control" id="bps_cap" name="bps_cap" type="hidden" value="524288000" />
                                 <input class="form-control" id="bps_max" name="bps_max" type="hidden" value="1073741824" />
                                 <input class="form-control" id="bps_max_length" name="bps_max_length" type="hidden" value="10" />

views/config.py

@@ -52,14 +52,14 @@ def create():
             'dns1': request.form.get('dns1'),
             'dns2': request.form.get('dns2'),
             'iops_base': int(request.form.get('iops_base', 1000)),
-            'iops_pre_unit': int(request.form.get('iops_pre_unit', 6)),
+            'iops_pre_unit': int(request.form.get('iops_pre_unit', 1)),
             'iops_cap': int(request.form.get('iops_cap', 2000)),
             'iops_max': int(request.form.get('iops_max', 3000)),
             'iops_max_length': int(request.form.get('iops_max_length', 20)),
             # 200 MiB
             'bps_base': int(request.form.get('bps_base', 1024 * 1024 * 200)),
-            # 0.1 MiB
-            'bps_pre_unit': int(request.form.get('bps_pre_unit', 1024 * 1024 / 10)),
+            # 0.3 MiB
+            'bps_pre_unit': int(request.form.get('bps_pre_unit', 1024 * 1024 * 0.3)),
             # 500 MiB
             'bps_cap': int(request.form.get('bps_cap', 1024 * 1024 * 500)),
             # 1 GiB