rgw: fix bug with rgw-gap-list

rgw-gap-list would fail if it it reached the end of the second file
before the first, thereby causing an infinite loop.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
Signed-off-by: Michael J. Kidd <linuxkidd@gmail.com>
(cherry picked from commit 0cfbc57d2c43ea88845561f14e295d0d48e44b32)

diff --git a/src/rgw/rgw-gap-list b/src/rgw/rgw-gap-list
index 5018cedd7cb652cf21b57c0df160d049191efdda..3dc0e5def2ff0a528a0687f64c1d66e6deadf1ec 100755 (executable)
--- a/src/rgw/rgw-gap-list
+++ b/src/rgw/rgw-gap-list
@@ -400,9 +400,12 @@ BEGIN {
   f1_count++
   if(f2_eof==0) {
     if(test_lines()==2) {
-      while ($1>b[1]) {
+      while ($1>b[1] && !f2_eof) {
         advance_f2()
       }
+      if (f2_eof) {
+        line_out()
+      }
       test_lines()
     }
   } else {