From f9aa2efebd76f5a516af423c4f511201145c3230 Mon Sep 17 00:00:00 2001
From: goerzh <zhpan188@gmail.com>
Date: Sun, 28 Apr 2019 18:45:02 +0800
Subject: [PATCH] reduce heartbeat load

---
 src/report/Makefile                           |  4 +-
 .../{report_client.cpp => report_client.cc}   | 37 +++++++++++--------
 2 files changed, 23 insertions(+), 18 deletions(-)
 rename src/report/{report_client.cpp => report_client.cc} (93%)

diff --git a/src/report/Makefile b/src/report/Makefile
index 1eed833..eebfeb6 100644
--- a/src/report/Makefile
+++ b/src/report/Makefile
@@ -46,8 +46,8 @@ OBJS = ../grpc/language-agent-v2/.libs/trace.o ../grpc/language-agent-v2/.libs/t
         ../grpc/register/.libs/InstancePing-grpc.o ../grpc/common/.libs/common.o ../grpc/common/.libs/common-grpc.o \
         ../grpc/common/.libs/trace-common.o ../grpc/common/.libs/trace-common-grpc.o
 
-report_client: $(OBJS)
-	$(CXX) report_client.cpp $^ $(LDFLAGS) -Ideps/boost $(CXXFLAGS) -o $@
+report_client: $(OBJS) report_client.cc
+	$(CXX) $^ $(LDFLAGS) -Ideps/boost $(CXXFLAGS) -o $@
 
 clean:
 	rm -rf *.o *.pb.cc *.pb.h report_client \
diff --git a/src/report/report_client.cpp b/src/report/report_client.cc
similarity index 93%
rename from src/report/report_client.cpp
rename to src/report/report_client.cc
index f88e5da..30c5047 100644
--- a/src/report/report_client.cpp
+++ b/src/report/report_client.cc
@@ -113,14 +113,14 @@ int main(int argc, char **argv) {
         if (std::strncmp("-h", argv[i], sizeof(argv[i]) - 1) == 0 ||
             std::strncmp("--help", argv[i], sizeof(argv[i]) - 1) == 0) {
             std::cout << "report_client grpc log_path" << std::endl;
-            std::cout << "e.g. report_client 120.0.0.1:11800 /tmp" << std::endl;
+            std::cout << "e.g. report_client 127.0.0.1:11800 /tmp" << std::endl;
             return 0;
         }
     }
 
     if (argc == 1) {
         std::cout << "report_client grpc log_path" << std::endl;
-        std::cout << "e.g. report_client 120.0.0.1:11800 /tmp" << std::endl;
+        std::cout << "e.g. report_client 127.0.0.1:11800 /tmp" << std::endl;
         return 0;
     }
 
@@ -130,6 +130,8 @@ int main(int argc, char **argv) {
     std::map<int, std::string> instanceUUID;
     std::map<int, long> sendTime;
 
+    uint64_t index = 0;
+
     while (1) {
 
         struct dirent *dir;
@@ -138,24 +140,27 @@ int main(int argc, char **argv) {
             std::cerr << "open directory error";
             return 0;
         }
+        index += 1;
 
         // heartbeat
         for (auto &i: instancePid) {
 
-            struct timeval tv;
-            gettimeofday(&tv, NULL);
-
-            if(tv.tv_sec - sendTime[i.first] > 40) {
-                kill(instancePid[i.first], 0);
+            if (index % 3 == 0) {
+                struct timeval tv;
+                gettimeofday(&tv, NULL);
+
+//                if (tv.tv_sec - sendTime[i.first] > 40) {
+//                    kill(instancePid[i.first], 0);
+//                }
+
+                sendTime[i.first] = tv.tv_sec;
+                std::cout << "send heartbeat ..." << std::endl;
+                ServiceInstancePingPkg request;
+                request.set_serviceinstanceid(i.first);
+                request.set_time(tv.tv_sec * 1000 + tv.tv_usec / 1000);
+                request.set_serviceinstanceuuid(instanceUUID[i.first]);
+                greeter.heartbeat(request);
             }
-
-            sendTime[i.first] = tv.tv_sec;
-            std::cout << "send heartbeat ..." << std::endl;
-            ServiceInstancePingPkg request;
-            request.set_serviceinstanceid(i.first);
-            request.set_time(tv.tv_sec*1000 + tv.tv_usec/1000);
-            request.set_serviceinstanceuuid(instanceUUID[i.first]);
-            greeter.heartbeat(request);
         }
 
         while ((dir = readdir(dp)) != NULL) {
@@ -331,7 +336,7 @@ int main(int argc, char **argv) {
         }
         closedir(dp);
 
-        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     }
 
 
-- 
GitLab