thread: add DAEMON_CLEAR_ERRMSG to clear errmsg

Signed-off-by: Nlifeng68 <lifeng68@huawei.com>

CI/Dockerfile

@@ -114,7 +114,7 @@ RUN set -x && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/cmake.git && \
 	cd cmake && \
-	git checkout origin/openEuler-20.03-LTS && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
 	tar -xzvf cmake-3.12.1.tar.gz && \
 	cd cmake-3.12.1 && \
 	./bootstrap && make && make install && \
@@ -127,6 +127,7 @@ RUN set -x && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/protobuf.git && \
 	cd protobuf && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
 	tar -xzvf protobuf-all-3.9.0.tar.gz && \
 	cd protobuf-3.9.0 && \
 	./autogen.sh && \
@@ -141,6 +142,7 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/c-ares.git && \
 	cd c-ares && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
 	tar -xzvf c-ares-1.15.0.tar.gz && \
 	cd c-ares-1.15.0 && \
 	autoreconf -if && \
@@ -168,6 +170,7 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/libevent.git && \
 	cd libevent && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
 	tar -xzvf libevent-2.1.11-stable.tar.gz && \
 	cd libevent-2.1.11-stable && \
 	./autogen.sh && \
@@ -182,12 +185,11 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/libevhtp.git && \
 	cd libevhtp && \
-	tar -xzvf libevhtp-1.2.18.tar.gz && \
-	cd libevhtp-1.2.18 && \
-	patch -p1 -F1 -s < ../0001-decrease-numbers-of-fd-for-shared-pipe-mode.patch && \
-	patch -p1 -F1 -s < ../0002-evhtp-enable-dynamic-thread-pool.patch && \
-	patch -p1 -F1 -s < ../0003-close-open-ssl.-we-do-NOT-use-it-in-lcrd.patch && \
-	patch -p1 -F1 -s < ../0004-Use-shared-library-instead-static-one.patch && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
+	tar -xzvf libevhtp-1.2.16.tar.gz && \
+	cd libevhtp-1.2.16 && \
+	patch -p1 -F1 -s < ../0001-support-dynamic-threads.patch && \
+	patch -p1 -F1 -s < ../0002-close-openssl.patch && \
 	rm -rf build && \
 	mkdir build && \
 	cd build && \
@@ -202,8 +204,9 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/http-parser.git && \
 	cd http-parser && \
-	tar -xzvf http-parser-2.9.4.tar.gz && \
-	cd http-parser-2.9.4 && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
+	tar -xzvf http-parser-2.9.2.tar.gz && \
+	cd http-parser-2.9.2 && \
 	make -j CFLAGS="-Wno-error" && \
 	make CFLAGS="-Wno-error" install && \
 	ldconfig
@@ -214,8 +217,10 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/libwebsockets.git && \
 	cd libwebsockets && \
-	tar -xzvf libwebsockets-4.0.1.tar.gz && \
-	cd libwebsockets-4.0.1 && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
+	tar -xzvf libwebsockets-2.4.2.tar.gz && \
+	cd libwebsockets-2.4.2 && \
+	patch -p1 -F1 -s < ../libwebsockets-fix-coredump.patch && \
 	mkdir build && \
 	cd build && \
 	cmake -DLWS_WITH_SSL=0 -DLWS_MAX_SMP=32 -DCMAKE_BUILD_TYPE=Debug ../ && \
@@ -229,6 +234,7 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
 	cd ~ && \
 	git clone https://gitee.com/src-openeuler/gtest.git && \
 	cd gtest && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
 	tar xf release-1.8.1.tar.gz && \
 	cd googletest-release-1.8.1 && \
 	patch -p1 -F1 -s < ../gtest-1.8.1-null-pointer.patch && \
@@ -248,10 +254,10 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
         cd ~ && \
         git clone https://gitee.com/src-openeuler/libarchive.git && \
         cd libarchive && \
+	git checkout -b openEuler-20.03-LTS-tag openEuler-20.03-LTS-tag && \
         tar -zxvf libarchive-3.4.1.tar.gz && \
         cd libarchive-3.4.1 && \
         patch -p1 -F1 -s < ../libarchive-uninitialized-value.patch && \
-        patch -p1 -F1 -s < ../CVE-2020-9308.patch && \
         cd build && \
         cmake -DCMAKE_USE_SYSTEM_LIBRARIES=ON ../ && \
         make -j $(nproc) && \

CI/test_cases/helpers.bash

@@ -95,6 +95,7 @@ function wait_isulad_running() {
         fi
         if [ $waitcnt -gt $maxcnt ];then
             echo "iSulad is not running after ${maxcnt}s"
+            tail $ISUALD_LOG
             return 1
         fi
         waitcnt=$(($waitcnt+1))

src/daemon/executor/container_cb/execution_stream.c

@@ -1462,6 +1462,7 @@ static void *follow_thread_func(void *arg)
 
 set_flag:
     *(farg->finish) = true;
+    DAEMON_CLEAR_ERRMSG();
     return NULL;
 }
 

src/daemon/modules/container/health_check/health_check.c

@@ -596,6 +596,7 @@ out:
     free_container_exec_request(container_req);
     free_container_exec_response(container_res);
     container_unref(cont);
+    DAEMON_CLEAR_ERRMSG();
     return NULL;
 }
 
@@ -728,6 +729,7 @@ out:
     free(container_id);
     container_id = NULL;
     container_unref(cont);
+    DAEMON_CLEAR_ERRMSG();
     return NULL;
 }
 

src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c

@@ -23,6 +23,7 @@
 #include "wrapper_devmapper.h"
 #include "isula_libutils/log.h"
 #include "utils.h"
+#include "err_msg.h"
 
 static bool g_dm_saw_busy = false;
 static bool g_dm_saw_exist = false;
@@ -64,7 +65,6 @@ char *dev_strerror(int errnum)
             break;
     }
     return errmsg;
-
 }
 
 struct dm_task *task_create(int type)
@@ -342,12 +342,14 @@ static void *udev_wait_process(void *data)
         pthread_mutex_lock(&uwait->udev_mutex);
         uwait->state = ERR_UDEV_WAIT;
         pthread_mutex_unlock(&uwait->udev_mutex);
+        DAEMON_CLEAR_ERRMSG();
         pthread_exit((void *)ERR_UDEV_WAIT);
     }
 
     pthread_mutex_lock(&uwait->udev_mutex);
     uwait->state = DEV_OK;
     pthread_mutex_unlock(&uwait->udev_mutex);
+    DAEMON_CLEAR_ERRMSG();
     pthread_exit((void *)0);
 }
 

src/daemon/modules/service/io_handler.c

@@ -34,6 +34,7 @@
 #include "io_wrapper.h"
 #include "utils.h"
 #include "utils_file.h"
+#include "err_msg.h"
 
 static char *create_single_fifo(const char *statepath, const char *subpath, const char *stdflag)
 {
@@ -376,6 +377,7 @@ err:
         sem_post(&thread_arg->wait_sem);
     }
     io_copy_thread_cleanup(writers, thread_arg, infds, outfds, srcfds, len);
+    DAEMON_CLEAR_ERRMSG();
     return NULL;
 }
 

src/utils/http/CMakeLists.txt

@@ -5,7 +5,9 @@ if (NOT OPENSSL_VERIFY)
     list(REMOVE_ITEM http_client_srcs "${CMAKE_CURRENT_SOURCE_DIR}/certificate.c")
 endif()
 
-add_library(libhttpclient ${LIBTYPE} ${http_client_srcs})
+add_library(libhttpclient ${LIBTYPE} ${http_client_srcs}
+    ${CMAKE_SOURCE_DIR}/src/utils/buffer/buffer.c
+    )
 
 target_include_directories(libhttpclient PUBLIC 
     ${CMAKE_SOURCE_DIR}/src/common