]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks: use spaces intead of tabs for indent
authorKefu Chai <kchai@redhat.com>
Fri, 27 Mar 2020 03:39:24 +0000 (11:39 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 2 Jun 2020 02:32:23 +0000 (10:32 +0800)
to address the errors of
```
TabError: inconsistent use of tabs and spaces in indentation
```

somehow in master, we are using spaces instead of tabs, so this change
is not cherry-picked from master.

Signed-off-by: Kefu Chai <kchai@redhat.com>
qa/tasks/ceph_manager.py
qa/tasks/keystone.py
qa/tasks/peer.py
qa/tasks/radosgw_admin.py

index d2301a5fe2fa6eefc9777e818ce9059ed71f4268..0aa2f08d612f4ee89624afb5840a61c1892a8169 100644 (file)
@@ -2260,8 +2260,8 @@ class CephManager:
                 else:
                     self.log("no progress seen, keeping timeout for now")
                     if now - start >= timeout:
-                       if self.is_recovered():
-                           break
+                        if self.is_recovered():
+                            break
                         self.log('dumping pgs')
                         out = self.raw_cluster_cmd('pg', 'dump')
                         self.log(out)
index 673547aa5b914b1ccf8b5d69654a689c991a0c62..baf99324d8ea6623cb799fd1e0730965832a0255 100644 (file)
@@ -144,7 +144,7 @@ def setup_venv(ctx, config):
     try:
         yield
     finally:
-       pass
+        pass
 
 @contextlib.contextmanager
 def configure_instance(ctx, config):
index 5cdb96140fe80192aff8535475005dc97df8dac1..6b19096b15a1392f6ec390085e5bd379a168d948 100644 (file)
@@ -65,7 +65,7 @@ def task(ctx, config):
     pgs = manager.get_pg_stats()
     for pg in pgs:
         out = manager.raw_cluster_cmd('pg', pg['pgid'], 'query')
-       log.debug("out string %s",out)
+        log.debug("out string %s",out)
         j = json.loads(out)
         log.info("pg is %s, query json is %s", pg, j)
 
index d6faa03e0ed37feb6e30051af72a4f467adb1fed..8fe54df4c38cb58217ceed0ca7af8501d6ae906a 100644 (file)
@@ -199,10 +199,10 @@ class requestlog_queue():
         self.adder = add
     def handle_request_data(self, request, response, error=False):
         now = datetime.datetime.now()
-       if error:
-           pass
-       elif response.status < 200 or response.status >= 400:
-           error = True
+        if error:
+            pass
+        elif response.status < 200 or response.status >= 400:
+            error = True
         self.q.put({'t': now, 'o': request, 'i': response, 'e': error})
     def clear(self):
         with self.q.mutex:
@@ -210,17 +210,17 @@ class requestlog_queue():
     def log_and_clear(self, cat, bucket, user, add_entry = None):
         while not self.q.empty():
             j = self.q.get()
-           bytes_out = 0
+            bytes_out = 0
             if 'Content-Length' in j['o'].headers:
-               bytes_out = int(j['o'].headers['Content-Length'])
+                bytes_out = int(j['o'].headers['Content-Length'])
             bytes_in = 0
             if 'content-length' in j['i'].msg.dict:
-               bytes_in = int(j['i'].msg.dict['content-length'])
+                bytes_in = int(j['i'].msg.dict['content-length'])
             log.info('RL: %s %s %s bytes_out=%d bytes_in=%d failed=%r'
-               % (cat, bucket, user, bytes_out, bytes_in, j['e']))
-           if add_entry == None:
-               add_entry = self.adder
-           add_entry(cat, bucket, user, bytes_out, bytes_in, j['e'])
+                     % (cat, bucket, user, bytes_out, bytes_in, j['e']))
+            if add_entry == None:
+                add_entry = self.adder
+            add_entry(cat, bucket, user, bytes_out, bytes_in, j['e'])
 
 def create_presigned_url(conn, method, bucket_name, key_name, expiration):
     return conn.generate_url(expires_in=expiration,
@@ -922,14 +922,14 @@ import argparse;
 
 def main():
     if len(sys.argv) == 3:
-       user = sys.argv[1] + "@"
-       host = sys.argv[2]
+        user = sys.argv[1] + "@"
+        host = sys.argv[2]
     elif len(sys.argv) == 2:
         user = ""
-       host = sys.argv[1]
+        host = sys.argv[1]
     else:
         sys.stderr.write("usage: radosgw_admin.py [user] host\n")
-       exit(1)
+        exit(1)
     client0 = remote.Remote(user + host)
     ctx = config
     ctx.cluster=cluster.Cluster(remotes=[(client0,
@@ -941,8 +941,8 @@ def main():
     ctx.rgw.role_endpoints = endpoints
     ctx.rgw.realm = None
     ctx.rgw.regions = {'region0': { 'api name': 'api1',
-           'is master': True, 'master zone': 'r0z0',
-           'zones': ['r0z0', 'r0z1'] }}
+                                    'is master': True, 'master zone': 'r0z0',
+                                   'zones': ['r0z0', 'r0z1'] }}
     ctx.rgw.config = {'ceph.client.rgw.%s' % host: {'system user': {'name': '%s-system-user' % host}}}
     task(config, None)
     exit()