From d67f0a1ea403fbebfff70e7eaf4fe4870be2a1b8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 08 八月 2023 16:06:02 +0800
Subject: [PATCH] 解决使用redis集群时获取发送端口失败的问题
---
src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java | 42 ++++++++++++++++----
src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java | 31 ++++++++++++---
2 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
index f960c7d..3f28d02 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
@@ -30,7 +30,7 @@
private final String KEY = "VM_MEDIA_SEND_RTP_PORT_";
- public int getNextPort(MediaServerItem mediaServer) {
+ public synchronized int getNextPort(MediaServerItem mediaServer) {
if (mediaServer == null) {
logger.warn("[鍙戦�佺鍙ｇ鐞哴 鍙傛暟閿欒锛宮ediaServer涓篘ULL");
return -1;
@@ -50,17 +50,15 @@
String sendRtpPortRange = mediaServer.getSendRtpPortRange();
int startPort;
int endPort;
- if (sendRtpPortRange == null) {
- logger.warn("{}鏈缃彂閫佺鍙ｉ粯璁ゅ�硷紝鑷姩浣跨敤40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ if (sendRtpPortRange != null) {
String[] portArray = sendRtpPortRange.split(",");
if (portArray.length != 2 || !NumberUtils.isParsable(portArray[0]) || !NumberUtils.isParsable(portArray[1])) {
- logger.warn("{}鍙戦�佺鍙ｉ厤缃牸寮忛敊璇紝鑷姩浣跨敤40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ logger.warn("{}鍙戦�佺鍙ｉ厤缃牸寮忛敊璇紝鑷姩浣跨敤50000-60000浣滀负绔彛鑼冨洿", mediaServer.getId());
startPort = 50000;
endPort = 60000;
}else {
-
if ( Integer.parseInt(portArray[1]) - Integer.parseInt(portArray[0]) < 1) {
- logger.warn("{}鍙戦�佺鍙ｉ厤缃敊璇�,缁撴潫绔彛鑷冲皯姣斿紑濮嬬鍙ｅぇ涓�锛岃嚜鍔ㄤ娇鐢�40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ logger.warn("{}鍙戦�佺鍙ｉ厤缃敊璇�,缁撴潫绔彛鑷冲皯姣斿紑濮嬬鍙ｅぇ涓�锛岃嚜鍔ㄤ娇鐢�50000-60000浣滀负绔彛鑼冨洿", mediaServer.getId());
startPort = 50000;
endPort = 60000;
}else {
@@ -69,6 +67,7 @@
}
}
}else {
+ logger.warn("{}鏈缃彂閫佺鍙ｉ粯璁ゅ�硷紝鑷姩浣跨敤50000-60000浣滀负绔彛鑼冨洿", mediaServer.getId());
startPort = 50000;
endPort = 60000;
}
@@ -76,10 +75,35 @@
logger.warn("{}鑾峰彇redis杩炴帴淇℃伅澶辫触", mediaServer.getId());
return -1;
}
+// RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
+// return redisAtomicInteger.getAndUpdate((current)->{
+// return getPort(current, startPort, endPort, checkPort-> !sendRtpItemMap.containsKey(checkPort));
+// });
+ return getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+ }
+
+ private synchronized int getSendPort(int startPort, int endPort, String sendIndexKey, Map<Integer, SendRtpItem> sendRtpItemMap){
RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
- return redisAtomicInteger.getAndUpdate((current)->{
- return getPort(current, startPort, endPort, checkPort-> !sendRtpItemMap.containsKey(checkPort));
- });
+ if (redisAtomicInteger.get() < startPort) {
+ redisAtomicInteger.set(startPort);
+ return startPort;
+ }else {
+ int port = redisAtomicInteger.getAndIncrement();
+ if (port > endPort) {
+ redisAtomicInteger.set(startPort);
+ if (sendRtpItemMap.containsKey(startPort)) {
+ return getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+ }else {
+ return startPort;
+ }
+ }
+ if (sendRtpItemMap.containsKey(port)) {
+ return getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+ }else {
+ return port;
+ }
+ }
+
}
interface CheckPortCallback{
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
index a2fd81b..045480a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
@@ -16,7 +16,6 @@
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.OtherPsSendInfo;
-import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -200,9 +199,9 @@
callId);
MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
String key = VideoManagerConstants.WVP_OTHER_SEND_PS_INFO + userSetting.getServerId() + "_" + callId;
- OtherRtpSendInfo sendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(key);
+ OtherPsSendInfo sendInfo = (OtherPsSendInfo)redisTemplate.opsForValue().get(key);
if (sendInfo == null) {
- sendInfo = new OtherRtpSendInfo();
+ sendInfo = new OtherPsSendInfo();
}
sendInfo.setPushApp(app);
sendInfo.setPushStream(stream);
@@ -221,7 +220,7 @@
param.put("dst_port", dstPort);
String is_Udp = isUdp ? "1" : "0";
param.put("is_udp", is_Udp);
- param.put("src_port", sendInfo.getSendLocalPortForAudio());
+ param.put("src_port", sendInfo.getSendLocalPort());
param.put("use_ps", "0");
param.put("only_audio", "1");
@@ -248,7 +247,7 @@
}, 10000);
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
- OtherRtpSendInfo finalSendInfo = sendInfo;
+ OtherPsSendInfo finalSendInfo = sendInfo;
hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
hookSubscribe.addSubscribe(hookSubscribeForStreamChange,
(mediaServerItemInUse, response)->{
@@ -280,7 +279,7 @@
public void closeSendRTP(String callId) {
logger.info("[绗笁鏂筆S鏈嶅姟瀵规帴->鍏抽棴鍙戦�佹祦] callId->{}", callId);
String key = VideoManagerConstants.WVP_OTHER_SEND_PS_INFO + userSetting.getServerId() + "_" + callId;
- OtherRtpSendInfo sendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(key);
+ OtherPsSendInfo sendInfo = (OtherPsSendInfo)redisTemplate.opsForValue().get(key);
if (sendInfo == null){
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈紑鍚彂娴�");
}
@@ -300,4 +299,24 @@
redisTemplate.delete(key);
}
+
+ @GetMapping(value = "/getTestPort")
+ @ResponseBody
+ public int getTestPort() {
+ MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
+
+// for (int i = 0; i <300; i++) {
+// new Thread(() -> {
+// int nextPort = sendRtpPortManager.getNextPort(defaultMediaServer);
+// try {
+// Thread.sleep((int)Math.random()*10);
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+// System.out.println(nextPort);
+// }).start();
+// }
+
+ return sendRtpPortManager.getNextPort(defaultMediaServer);
+ }
}
--
Gitblit v1.8.0