소스 검색

bump online notification pause to 100ms

also put all online notification redis commands into a single tx
Grant Limberg 5 년 전
부모
커밋
06de25a680
1개의 변경된 파일3개의 추가작업 그리고 5개의 파일을 삭제
  1. 3 5
      controller/PostgreSQL.cpp

+ 3 - 5
controller/PostgreSQL.cpp

@@ -1590,7 +1590,7 @@ void PostgreSQL::onlineNotificationThread()
 			fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what());
 			fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what());
 #endif
 #endif
 		}
 		}
-		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+		std::this_thread::sleep_for(std::chrono::milliseconds(100));
 	}
 	}
 
 
 	fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
 	fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
@@ -1705,7 +1705,7 @@ void PostgreSQL::onlineNotification_Postgres(PGconn *conn, std::unordered_map< s
 			PQclear(res);
 			PQclear(res);
 		}
 		}
 
 
-	// 	std::this_thread::sleep_for(std::chrono::milliseconds(10));
+	// 	std::this_thread::sleep_for(std::chrono::milliseconds(100));
 	// }
 	// }
 	// fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
 	// fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
 	// PQfinish(conn);
 	// PQfinish(conn);
@@ -1743,7 +1743,7 @@ void PostgreSQL::onlineNotification_Redis()
 			fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what());
 			fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what());
 #endif
 #endif
 		}
 		}
-		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+		std::this_thread::sleep_for(std::chrono::milliseconds(100));
 	}
 	}
 }
 }
 
 
@@ -1785,8 +1785,6 @@ void PostgreSQL::_doRedisUpdate(sw::redis::Transaction &tx, std::string &control
 			.hmset("member:{"+controllerId+"}:"+networkId+":"+memberId, record.begin(), record.end());
 			.hmset("member:{"+controllerId+"}:"+networkId+":"+memberId, record.begin(), record.end());
 	}
 	}
 
 
-	tx.exec();
-
 	// expire records from all-nodes and network-nodes member list
 	// expire records from all-nodes and network-nodes member list
 	uint64_t expireOld = OSUtils::now() - 300000;
 	uint64_t expireOld = OSUtils::now() - 300000;