Merge pull request #7328 from oranagra/daily_tls_test

avoid using sendfile if tls-replication is enabled

.github/workflows/daily.yml

@@ -49,6 +49,21 @@ jobs:
     - name: module api test
       run: ./runtest-moduleapi --verbose
 
+  test-tls:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: make
+      run: |
+        make BUILD_TLS=yes
+    - name: test
+      run: |
+        sudo apt-get install tcl8.5 tcl-tls
+        ./utils/gen-test-certs.sh
+        ./runtest --accurate --verbose --tls
+    - name: module api test
+      run: ./runtest-moduleapi --verbose --tls
+
   test-valgrind:
     runs-on: ubuntu-latest
     timeout-minutes: 14400

src/replication.c

@@ -1032,8 +1032,12 @@ void sendBulkToSlave(connection *conn) {
         }
     }
 
-    /* If the preamble was already transferred, send the RDB bulk data. */
+    /* If the preamble was already transferred, send the RDB bulk data.
+     * try to use sendfile system call if supported, unless tls is enabled.
+     * fallback to normal read+write otherwise. */
+    nwritten = 0;
 #if HAVE_SENDFILE
+    if (!server.tls_replication) {
         if ((nwritten = redis_sendfile(conn->fd,slave->repldbfd,
             slave->repldboff,PROTO_IOBUF_LEN)) == -1)
         {
@@ -1044,7 +1048,9 @@ void sendBulkToSlave(connection *conn) {
             }
             return;
         }
-#else
+    }
+#endif
+    if (!nwritten) {
         ssize_t buflen;
         char buf[PROTO_IOBUF_LEN];
 
@@ -1064,7 +1070,8 @@ void sendBulkToSlave(connection *conn) {
             }
             return;
         }
-#endif
+    }
+
     slave->repldboff += nwritten;
     server.stat_net_output_bytes += nwritten;
     if (slave->repldboff == slave->repldbsize) {