fix dpdk build error.

    when ./do_cmake.sh add  -DWITH_DPDK=ON -DUSE_CRYPTOPP=ON -DWITH_NSS=OFF -DWITH_TESTS=OFF
    if build debian package, need remove some file froms install since we disabled TESTS.

    Signed-off-by: chunmei <chunmei.liu@intel.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e48afcff51d0366a00f74f8f35900f9db8d51960..15021fab9aff24945b0d6e712d104857a4ddb4b8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -654,6 +654,9 @@ set(ceph_common_deps
 if(HAVE_RDMA)
   list(APPEND ceph_common_deps ${RDMA_LIBRARY})
 endif()
+if(HAVE_DPDK)
+  list(APPEND ceph_common_deps ${DPDK_LIBRARIES})
+endif()
 if(NOT WITH_SYSTEM_BOOST)
   list(APPEND ceph_common_deps ${ZLIB_LIBRARIES})
 endif()

diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc
index e828789a51db1836927e0177d360bafd8f3bfd7f..fce05098007f7d725cec8a5f50425be007e54453 100644 (file)
--- a/src/msg/async/dpdk/DPDKStack.cc
+++ b/src/msg/async/dpdk/DPDKStack.cc
@@ -48,6 +48,7 @@
 
 #include "common/dout.h"
 #include "include/assert.h"
+#include "common/Cond.h"
 
 #define dout_subsys ceph_subsys_dpdk
 #undef dout_prefix

diff --git a/src/msg/async/dpdk/TCP.h b/src/msg/async/dpdk/TCP.h
index a601130c335dfe1ce3174ba53739dbf5802f5a80..3eab5a5b9b92db662fe26fa2fe482f5879043895 100644 (file)
--- a/src/msg/async/dpdk/TCP.h
+++ b/src/msg/async/dpdk/TCP.h
@@ -383,7 +383,7 @@ class tcp {
       uint32_t key[16];
       isn_secret () {
         for (auto& k : key) {
-          k = ceph::util::generate_random_number<uint32_t>();
+          k = ceph::util::generate_random_number<uint32_t>(0, std::numeric_limits<uint32_t>::max());
         }
       }
     };