mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
SquashSRS4: Support circuit breaker
This commit is contained in:
parent
fd6c653d3c
commit
276bd2223e
16 changed files with 458 additions and 12 deletions
|
@ -182,6 +182,7 @@ The ports used by SRS:
|
||||||
|
|
||||||
## V4 changes
|
## V4 changes
|
||||||
|
|
||||||
|
* v4.0, 2021-05-07, RTC: Support circuit breaker. 4.0.103
|
||||||
* v4.0, 2021-05-07, RTC: Refine play stream find track. 4.0.102
|
* v4.0, 2021-05-07, RTC: Refine play stream find track. 4.0.102
|
||||||
* v4.0, 2021-05-07, RTC: Refine FastTimer to fixed interval. 4.0.101
|
* v4.0, 2021-05-07, RTC: Refine FastTimer to fixed interval. 4.0.101
|
||||||
* v4.0, 2021-05-06, RTC: Fix config bug for nack and twcc. 4.0.99
|
* v4.0, 2021-05-06, RTC: Fix config bug for nack and twcc. 4.0.99
|
||||||
|
|
|
@ -111,6 +111,37 @@ auto_reload_for_docker on;
|
||||||
# default: 0.8
|
# default: 0.8
|
||||||
tcmalloc_release_rate 0.8;
|
tcmalloc_release_rate 0.8;
|
||||||
|
|
||||||
|
# For system circuit breaker.
|
||||||
|
circuit_breaker {
|
||||||
|
# Whether enable the circuit breaker.
|
||||||
|
# Default: on
|
||||||
|
enabled on;
|
||||||
|
# The CPU percent(0, 100) ever 1s, as system high water-level, which enable the circuit-break
|
||||||
|
# mechanism, for example, NACK will be disabled if high water-level.
|
||||||
|
# Default: 90
|
||||||
|
high_threshold 90;
|
||||||
|
# Reset the high water-level, if number of pulse under high_threshold.
|
||||||
|
# @remark 0 to disable the high water-level.
|
||||||
|
# Default: 2
|
||||||
|
high_pulse 2;
|
||||||
|
# The CPU percent(0, 100) ever 1s, as system critical water-level, which enable the circuit-break
|
||||||
|
# mechanism, for example, TWCC will be disabled if high water-level.
|
||||||
|
# @note All circuit-break mechanism of high-water-level scope are enabled in critical.
|
||||||
|
# Default: 95
|
||||||
|
critical_threshold 95;
|
||||||
|
# Reset the critical water-level, if number of pulse under critical_threshold.
|
||||||
|
# @remark 0 to disable the critical water-level.
|
||||||
|
# Default: 1
|
||||||
|
critical_pulse 1;
|
||||||
|
# If dying, also drop packets for players.
|
||||||
|
# Default: 99
|
||||||
|
dying_threshold 99;
|
||||||
|
# If CPU exceed the dying_pulse times, enter dying.
|
||||||
|
# @remark 0 to disable the dying water-level.
|
||||||
|
# Default: 5
|
||||||
|
dying_pulse 5;
|
||||||
|
}
|
||||||
|
|
||||||
#############################################################################################
|
#############################################################################################
|
||||||
# heartbeat/stats sections
|
# heartbeat/stats sections
|
||||||
#############################################################################################
|
#############################################################################################
|
||||||
|
|
2
trunk/configure
vendored
2
trunk/configure
vendored
|
@ -274,7 +274,7 @@ MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_sourc
|
||||||
"srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call"
|
"srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call"
|
||||||
"srs_app_caster_flv" "srs_app_process" "srs_app_ng_exec"
|
"srs_app_caster_flv" "srs_app_process" "srs_app_ng_exec"
|
||||||
"srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
|
"srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
|
||||||
"srs_app_coworkers" "srs_app_hybrid")
|
"srs_app_coworkers" "srs_app_hybrid" "srs_app_threads")
|
||||||
if [[ $SRS_RTC == YES ]]; then
|
if [[ $SRS_RTC == YES ]]; then
|
||||||
MODULE_FILES+=("srs_app_rtc_conn" "srs_app_rtc_dtls" "srs_app_rtc_sdp"
|
MODULE_FILES+=("srs_app_rtc_conn" "srs_app_rtc_dtls" "srs_app_rtc_sdp"
|
||||||
"srs_app_rtc_queue" "srs_app_rtc_server" "srs_app_rtc_source" "srs_app_rtc_api")
|
"srs_app_rtc_queue" "srs_app_rtc_server" "srs_app_rtc_source" "srs_app_rtc_api")
|
||||||
|
|
|
@ -3608,6 +3608,7 @@ srs_error_t SrsConfig::check_normal_config()
|
||||||
&& n != "ff_log_level" && n != "grace_final_wait" && n != "force_grace_quit"
|
&& n != "ff_log_level" && n != "grace_final_wait" && n != "force_grace_quit"
|
||||||
&& n != "grace_start_wait" && n != "empty_ip_ok" && n != "disable_daemon_for_docker"
|
&& n != "grace_start_wait" && n != "empty_ip_ok" && n != "disable_daemon_for_docker"
|
||||||
&& n != "inotify_auto_reload" && n != "auto_reload_for_docker" && n != "tcmalloc_release_rate"
|
&& n != "inotify_auto_reload" && n != "auto_reload_for_docker" && n != "tcmalloc_release_rate"
|
||||||
|
&& n != "circuit_breaker"
|
||||||
) {
|
) {
|
||||||
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal directive %s", n.c_str());
|
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal directive %s", n.c_str());
|
||||||
}
|
}
|
||||||
|
@ -4321,6 +4322,125 @@ double SrsConfig::tcmalloc_release_rate()
|
||||||
return trr;
|
return trr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool SrsConfig::get_circuit_breaker()
|
||||||
|
{
|
||||||
|
static bool DEFAULT = true;
|
||||||
|
|
||||||
|
SrsConfDirective* conf = root->get("circuit_breaker");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
conf = conf->get("enabled");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return SRS_CONF_PERFER_TRUE(conf->arg0());
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsConfig::get_high_threshold()
|
||||||
|
{
|
||||||
|
static int DEFAULT = 90;
|
||||||
|
|
||||||
|
SrsConfDirective* conf = root->get("circuit_breaker");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
conf = conf->get("high_threshold");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ::atoi(conf->arg0().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsConfig::get_high_pulse()
|
||||||
|
{
|
||||||
|
static int DEFAULT = 2;
|
||||||
|
|
||||||
|
SrsConfDirective* conf = root->get("circuit_breaker");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
conf = conf->get("high_pulse");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ::atoi(conf->arg0().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsConfig::get_critical_threshold()
|
||||||
|
{
|
||||||
|
static int DEFAULT = 95;
|
||||||
|
|
||||||
|
SrsConfDirective* conf = root->get("circuit_breaker");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
conf = conf->get("critical_threshold");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ::atoi(conf->arg0().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsConfig::get_critical_pulse()
|
||||||
|
{
|
||||||
|
static int DEFAULT = 1;
|
||||||
|
|
||||||
|
SrsConfDirective* conf = root->get("circuit_breaker");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
conf = conf->get("critical_pulse");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ::atoi(conf->arg0().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsConfig::get_dying_threshold()
|
||||||
|
{
|
||||||
|
static int DEFAULT = 99;
|
||||||
|
|
||||||
|
SrsConfDirective* conf = root->get("circuit_breaker");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
conf = conf->get("dying_threshold");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ::atoi(conf->arg0().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
int SrsConfig::get_dying_pulse()
|
||||||
|
{
|
||||||
|
static int DEFAULT = 5;
|
||||||
|
|
||||||
|
SrsConfDirective* conf = root->get("circuit_breaker");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
conf = conf->get("dying_pulse");
|
||||||
|
if (!conf) {
|
||||||
|
return DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ::atoi(conf->arg0().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
vector<SrsConfDirective*> SrsConfig::get_stream_casters()
|
vector<SrsConfDirective*> SrsConfig::get_stream_casters()
|
||||||
{
|
{
|
||||||
srs_assert(root);
|
srs_assert(root);
|
||||||
|
|
|
@ -487,6 +487,15 @@ public:
|
||||||
virtual bool auto_reload_for_docker();
|
virtual bool auto_reload_for_docker();
|
||||||
// For tcmalloc, get the release rate.
|
// For tcmalloc, get the release rate.
|
||||||
virtual double tcmalloc_release_rate();
|
virtual double tcmalloc_release_rate();
|
||||||
|
// Thread pool section.
|
||||||
|
public:
|
||||||
|
virtual bool get_circuit_breaker();
|
||||||
|
virtual int get_high_threshold();
|
||||||
|
virtual int get_high_pulse();
|
||||||
|
virtual int get_critical_threshold();
|
||||||
|
virtual int get_critical_pulse();
|
||||||
|
virtual int get_dying_threshold();
|
||||||
|
virtual int get_dying_pulse();
|
||||||
// stream_caster section
|
// stream_caster section
|
||||||
public:
|
public:
|
||||||
// Get all stream_caster in config file.
|
// Get all stream_caster in config file.
|
||||||
|
|
|
@ -194,8 +194,11 @@ srs_error_t SrsFastTimer::cycle()
|
||||||
return srs_error_wrap(err, "quit");
|
return srs_error_wrap(err, "quit");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
++_srs_pps_timer->sugar;
|
||||||
|
|
||||||
for (int i = 0; i < (int)handlers_.size(); i++) {
|
for (int i = 0; i < (int)handlers_.size(); i++) {
|
||||||
ISrsFastTimer* timer = handlers_.at(i);
|
ISrsFastTimer* timer = handlers_.at(i);
|
||||||
|
|
||||||
if ((err = timer->on_timer(interval_)) != srs_success) {
|
if ((err = timer->on_timer(interval_)) != srs_success) {
|
||||||
srs_freep(err); // Ignore any error for shared timer.
|
srs_freep(err); // Ignore any error for shared timer.
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,6 +57,7 @@ using namespace std;
|
||||||
#include <srs_app_rtc_server.hpp>
|
#include <srs_app_rtc_server.hpp>
|
||||||
#include <srs_app_rtc_source.hpp>
|
#include <srs_app_rtc_source.hpp>
|
||||||
#include <srs_protocol_utility.hpp>
|
#include <srs_protocol_utility.hpp>
|
||||||
|
#include <srs_app_threads.hpp>
|
||||||
|
|
||||||
#include <srs_protocol_kbps.hpp>
|
#include <srs_protocol_kbps.hpp>
|
||||||
|
|
||||||
|
@ -72,6 +73,8 @@ SrsPps* _srs_pps_conn = new SrsPps();
|
||||||
|
|
||||||
extern SrsPps* _srs_pps_snack;
|
extern SrsPps* _srs_pps_snack;
|
||||||
extern SrsPps* _srs_pps_snack2;
|
extern SrsPps* _srs_pps_snack2;
|
||||||
|
extern SrsPps* _srs_pps_snack3;
|
||||||
|
extern SrsPps* _srs_pps_snack4;
|
||||||
|
|
||||||
extern SrsPps* _srs_pps_rnack;
|
extern SrsPps* _srs_pps_rnack;
|
||||||
extern SrsPps* _srs_pps_rnack2;
|
extern SrsPps* _srs_pps_rnack2;
|
||||||
|
@ -532,6 +535,7 @@ srs_error_t SrsRtcPlayStream::start()
|
||||||
}
|
}
|
||||||
|
|
||||||
// The timer for play, process TWCC in the future.
|
// The timer for play, process TWCC in the future.
|
||||||
|
// @see SrsRtcPlayStream::on_timer()
|
||||||
_srs_hybrid->timer1s()->subscribe(this);
|
_srs_hybrid->timer1s()->subscribe(this);
|
||||||
|
|
||||||
if ((err = pli_worker_->start()) != srs_success) {
|
if ((err = pli_worker_->start()) != srs_success) {
|
||||||
|
@ -1053,6 +1057,7 @@ srs_error_t SrsRtcPublishStream::start()
|
||||||
}
|
}
|
||||||
|
|
||||||
// For publisher timer, such as TWCC and RR.
|
// For publisher timer, such as TWCC and RR.
|
||||||
|
// @see SrsRtcPublishStream::on_timer()
|
||||||
_srs_hybrid->timer100ms()->subscribe(this);
|
_srs_hybrid->timer100ms()->subscribe(this);
|
||||||
|
|
||||||
if ((err = source->on_publish()) != srs_success) {
|
if ((err = source->on_publish()) != srs_success) {
|
||||||
|
@ -1299,6 +1304,12 @@ srs_error_t SrsRtcPublishStream::do_on_rtp_plaintext(SrsRtpPacket2*& pkt, SrsBuf
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If circuit-breaker is enabled, disable nack.
|
||||||
|
if (_srs_circuit_breaker->hybrid_critical_water_level()) {
|
||||||
|
++_srs_pps_snack4->sugar;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
// For NACK to handle packet.
|
// For NACK to handle packet.
|
||||||
// @remark Note that the pkt might be set to NULL.
|
// @remark Note that the pkt might be set to NULL.
|
||||||
if (nack_enabled_) {
|
if (nack_enabled_) {
|
||||||
|
@ -1547,6 +1558,12 @@ srs_error_t SrsRtcPublishStream::on_timer(srs_utime_t interval)
|
||||||
if (twcc_enabled_) {
|
if (twcc_enabled_) {
|
||||||
++_srs_pps_twcc->sugar;
|
++_srs_pps_twcc->sugar;
|
||||||
|
|
||||||
|
// If circuit-breaker is dropping packet, disable TWCC.
|
||||||
|
if (_srs_circuit_breaker->hybrid_critical_water_level()) {
|
||||||
|
++_srs_pps_snack4->sugar;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
// We should not depends on the received packet,
|
// We should not depends on the received packet,
|
||||||
// instead we should send feedback every Nms.
|
// instead we should send feedback every Nms.
|
||||||
if ((err = send_periodic_twcc()) != srs_success) {
|
if ((err = send_periodic_twcc()) != srs_success) {
|
||||||
|
@ -1701,6 +1718,8 @@ SrsRtcConnection::SrsRtcConnection(SrsRtcServer* s, const SrsContextId& cid)
|
||||||
pp_address_change = new SrsErrorPithyPrint();
|
pp_address_change = new SrsErrorPithyPrint();
|
||||||
pli_epp = new SrsErrorPithyPrint();
|
pli_epp = new SrsErrorPithyPrint();
|
||||||
|
|
||||||
|
nack_enabled_ = false;
|
||||||
|
|
||||||
_srs_rtc_manager->subscribe(this);
|
_srs_rtc_manager->subscribe(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1954,14 +1973,18 @@ srs_error_t SrsRtcConnection::initialize(SrsRequest* r, bool dtls, bool srtp, st
|
||||||
}
|
}
|
||||||
|
|
||||||
// The RTC connection start a timer, handle nacks.
|
// The RTC connection start a timer, handle nacks.
|
||||||
|
// @see SrsRtcConnection::on_timer()
|
||||||
_srs_hybrid->timer20ms()->subscribe(this);
|
_srs_hybrid->timer20ms()->subscribe(this);
|
||||||
|
|
||||||
// TODO: FIXME: Support reload.
|
// TODO: FIXME: Support reload.
|
||||||
session_timeout = _srs_config->get_rtc_stun_timeout(req->vhost);
|
session_timeout = _srs_config->get_rtc_stun_timeout(req->vhost);
|
||||||
last_stun_time = srs_get_system_time();
|
last_stun_time = srs_get_system_time();
|
||||||
|
|
||||||
srs_trace("RTC init session, user=%s, url=%s, encrypt=%u/%u, DTLS(role=%s, version=%s), timeout=%dms", username.c_str(),
|
nack_enabled_ = _srs_config->get_rtc_nack_enabled(req->vhost);
|
||||||
r->get_stream_url().c_str(), dtls, srtp, cfg->dtls_role.c_str(), cfg->dtls_version.c_str(), srsu2msi(session_timeout));
|
|
||||||
|
srs_trace("RTC init session, user=%s, url=%s, encrypt=%u/%u, DTLS(role=%s, version=%s), timeout=%dms, nack=%d",
|
||||||
|
username.c_str(), r->get_stream_url().c_str(), dtls, srtp, cfg->dtls_role.c_str(), cfg->dtls_version.c_str(),
|
||||||
|
srsu2msi(session_timeout), nack_enabled_);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -2332,11 +2355,17 @@ srs_error_t SrsRtcConnection::on_timer(srs_utime_t interval)
|
||||||
{
|
{
|
||||||
srs_error_t err = srs_success;
|
srs_error_t err = srs_success;
|
||||||
|
|
||||||
|
if (!nack_enabled_) {
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
++_srs_pps_conn->sugar;
|
++_srs_pps_conn->sugar;
|
||||||
|
|
||||||
// For publisher to send NACK.
|
// If circuit-breaker is enabled, disable nack.
|
||||||
// TODO: FIXME: Merge with hybrid system clock.
|
if (_srs_circuit_breaker->hybrid_critical_water_level()) {
|
||||||
srs_update_system_time();
|
++_srs_pps_snack4->sugar;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
std::map<std::string, SrsRtcPublishStream*>::iterator it;
|
std::map<std::string, SrsRtcPublishStream*>::iterator it;
|
||||||
for (it = publishers_.begin(); it != publishers_.end(); it++) {
|
for (it = publishers_.begin(); it != publishers_.end(); it++) {
|
||||||
|
|
|
@ -454,6 +454,8 @@ private:
|
||||||
SrsErrorPithyPrint* pp_address_change;
|
SrsErrorPithyPrint* pp_address_change;
|
||||||
// Pithy print for PLI request.
|
// Pithy print for PLI request.
|
||||||
SrsErrorPithyPrint* pli_epp;
|
SrsErrorPithyPrint* pli_epp;
|
||||||
|
private:
|
||||||
|
bool nack_enabled_;
|
||||||
public:
|
public:
|
||||||
SrsRtcConnection(SrsRtcServer* s, const SrsContextId& cid);
|
SrsRtcConnection(SrsRtcServer* s, const SrsContextId& cid);
|
||||||
virtual ~SrsRtcConnection();
|
virtual ~SrsRtcConnection();
|
||||||
|
|
|
@ -33,6 +33,12 @@ using namespace std;
|
||||||
#include <srs_kernel_rtc_rtp.hpp>
|
#include <srs_kernel_rtc_rtp.hpp>
|
||||||
#include <srs_kernel_utility.hpp>
|
#include <srs_kernel_utility.hpp>
|
||||||
#include <srs_app_utility.hpp>
|
#include <srs_app_utility.hpp>
|
||||||
|
#include <srs_app_threads.hpp>
|
||||||
|
|
||||||
|
#include <srs_protocol_kbps.hpp>
|
||||||
|
|
||||||
|
extern SrsPps* _srs_pps_snack3;
|
||||||
|
extern SrsPps* _srs_pps_snack4;
|
||||||
|
|
||||||
SrsRtpRingBuffer::SrsRtpRingBuffer(int capacity)
|
SrsRtpRingBuffer::SrsRtpRingBuffer(int capacity)
|
||||||
{
|
{
|
||||||
|
@ -228,6 +234,12 @@ SrsRtpNackForReceiver::~SrsRtpNackForReceiver()
|
||||||
|
|
||||||
void SrsRtpNackForReceiver::insert(uint16_t first, uint16_t last)
|
void SrsRtpNackForReceiver::insert(uint16_t first, uint16_t last)
|
||||||
{
|
{
|
||||||
|
// If circuit-breaker is enabled, disable nack.
|
||||||
|
if (_srs_circuit_breaker->hybrid_high_water_level()) {
|
||||||
|
++_srs_pps_snack4->sugar;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (uint16_t s = first; s != last; ++s) {
|
for (uint16_t s = first; s != last; ++s) {
|
||||||
queue_[s] = SrsRtpNackInfo();
|
queue_[s] = SrsRtpNackInfo();
|
||||||
}
|
}
|
||||||
|
@ -259,6 +271,13 @@ void SrsRtpNackForReceiver::check_queue_size()
|
||||||
|
|
||||||
void SrsRtpNackForReceiver::get_nack_seqs(SrsRtcpNack& seqs, uint32_t& timeout_nacks)
|
void SrsRtpNackForReceiver::get_nack_seqs(SrsRtcpNack& seqs, uint32_t& timeout_nacks)
|
||||||
{
|
{
|
||||||
|
// If circuit-breaker is enabled, disable nack.
|
||||||
|
if (_srs_circuit_breaker->hybrid_high_water_level()) {
|
||||||
|
queue_.clear();
|
||||||
|
++_srs_pps_snack4->sugar;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
srs_utime_t now = srs_get_system_time();
|
srs_utime_t now = srs_get_system_time();
|
||||||
|
|
||||||
srs_utime_t interval = now - pre_check_time_;
|
srs_utime_t interval = now - pre_check_time_;
|
||||||
|
|
|
@ -281,6 +281,7 @@ srs_error_t SrsRtcServer::initialize()
|
||||||
srs_error_t err = srs_success;
|
srs_error_t err = srs_success;
|
||||||
|
|
||||||
// The RTC server start a timer, do routines of RTC server.
|
// The RTC server start a timer, do routines of RTC server.
|
||||||
|
// @see SrsRtcServer::on_timer()
|
||||||
_srs_hybrid->timer5s()->subscribe(this);
|
_srs_hybrid->timer5s()->subscribe(this);
|
||||||
|
|
||||||
// Initialize the black hole.
|
// Initialize the black hole.
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
#include <srs_protocol_json.hpp>
|
#include <srs_protocol_json.hpp>
|
||||||
#include <srs_app_pithy_print.hpp>
|
#include <srs_app_pithy_print.hpp>
|
||||||
#include <srs_app_log.hpp>
|
#include <srs_app_log.hpp>
|
||||||
|
#include <srs_app_threads.hpp>
|
||||||
|
|
||||||
#ifdef SRS_FFMPEG_FIT
|
#ifdef SRS_FFMPEG_FIT
|
||||||
#include <srs_app_rtc_codec.hpp>
|
#include <srs_app_rtc_codec.hpp>
|
||||||
|
@ -53,6 +54,8 @@
|
||||||
// The NACK sent by us(SFU).
|
// The NACK sent by us(SFU).
|
||||||
SrsPps* _srs_pps_snack = new SrsPps();
|
SrsPps* _srs_pps_snack = new SrsPps();
|
||||||
SrsPps* _srs_pps_snack2 = new SrsPps();
|
SrsPps* _srs_pps_snack2 = new SrsPps();
|
||||||
|
SrsPps* _srs_pps_snack3 = new SrsPps();
|
||||||
|
SrsPps* _srs_pps_snack4 = new SrsPps();
|
||||||
SrsPps* _srs_pps_sanack = new SrsPps();
|
SrsPps* _srs_pps_sanack = new SrsPps();
|
||||||
SrsPps* _srs_pps_svnack = new SrsPps();
|
SrsPps* _srs_pps_svnack = new SrsPps();
|
||||||
|
|
||||||
|
@ -61,6 +64,8 @@ SrsPps* _srs_pps_rnack2 = new SrsPps();
|
||||||
SrsPps* _srs_pps_rhnack = new SrsPps();
|
SrsPps* _srs_pps_rhnack = new SrsPps();
|
||||||
SrsPps* _srs_pps_rmnack = new SrsPps();
|
SrsPps* _srs_pps_rmnack = new SrsPps();
|
||||||
|
|
||||||
|
extern SrsPps* _srs_pps_aloss2;
|
||||||
|
|
||||||
// Firefox defaults as 109, Chrome is 111.
|
// Firefox defaults as 109, Chrome is 111.
|
||||||
const int kAudioPayloadType = 111;
|
const int kAudioPayloadType = 111;
|
||||||
const int kAudioChannel = 2;
|
const int kAudioChannel = 2;
|
||||||
|
@ -499,8 +504,10 @@ srs_error_t SrsRtcStream::on_publish()
|
||||||
return srs_error_wrap(err, "bridger on publish");
|
return srs_error_wrap(err, "bridger on publish");
|
||||||
}
|
}
|
||||||
|
|
||||||
// For SrsRtcStream::on_timer()
|
// The PLI interval for RTC2RTMP.
|
||||||
pli_for_rtmp_ = _srs_config->get_rtc_pli_for_rtmp(req->vhost);
|
pli_for_rtmp_ = _srs_config->get_rtc_pli_for_rtmp(req->vhost);
|
||||||
|
|
||||||
|
// @see SrsRtcStream::on_timer()
|
||||||
_srs_hybrid->timer100ms()->subscribe(this);
|
_srs_hybrid->timer100ms()->subscribe(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -576,6 +583,12 @@ srs_error_t SrsRtcStream::on_rtp(SrsRtpPacket2* pkt)
|
||||||
{
|
{
|
||||||
srs_error_t err = srs_success;
|
srs_error_t err = srs_success;
|
||||||
|
|
||||||
|
// If circuit-breaker is dying, drop packet.
|
||||||
|
if (_srs_circuit_breaker->hybrid_dying_water_level()) {
|
||||||
|
_srs_pps_aloss2->sugar += (int64_t)consumers.size();
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < (int)consumers.size(); i++) {
|
for (int i = 0; i < (int)consumers.size(); i++) {
|
||||||
SrsRtcConsumer* consumer = consumers.at(i);
|
SrsRtcConsumer* consumer = consumers.at(i);
|
||||||
if ((err = consumer->enqueue(pkt->copy())) != srs_success) {
|
if ((err = consumer->enqueue(pkt->copy())) != srs_success) {
|
||||||
|
|
|
@ -1261,9 +1261,6 @@ srs_error_t SrsServer::setup_ticks()
|
||||||
if ((err = timer_->tick(2, 3 * SRS_UTIME_SECONDS)) != srs_success) {
|
if ((err = timer_->tick(2, 3 * SRS_UTIME_SECONDS)) != srs_success) {
|
||||||
return srs_error_wrap(err, "tick");
|
return srs_error_wrap(err, "tick");
|
||||||
}
|
}
|
||||||
if ((err = timer_->tick(3, 3 * SRS_UTIME_SECONDS)) != srs_success) {
|
|
||||||
return srs_error_wrap(err, "tick");
|
|
||||||
}
|
|
||||||
if ((err = timer_->tick(4, 6 * SRS_UTIME_SECONDS)) != srs_success) {
|
if ((err = timer_->tick(4, 6 * SRS_UTIME_SECONDS)) != srs_success) {
|
||||||
return srs_error_wrap(err, "tick");
|
return srs_error_wrap(err, "tick");
|
||||||
}
|
}
|
||||||
|
@ -1305,7 +1302,6 @@ srs_error_t SrsServer::notify(int event, srs_utime_t interval, srs_utime_t tick)
|
||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case 2: srs_update_system_rusage(); break;
|
case 2: srs_update_system_rusage(); break;
|
||||||
case 3: srs_update_proc_stat(); break;
|
|
||||||
case 4: srs_update_disk_stat(); break;
|
case 4: srs_update_disk_stat(); break;
|
||||||
case 5: srs_update_meminfo(); break;
|
case 5: srs_update_meminfo(); break;
|
||||||
case 6: srs_update_platform_info(); break;
|
case 6: srs_update_platform_info(); break;
|
||||||
|
|
149
trunk/src/app/srs_app_threads.cpp
Normal file
149
trunk/src/app/srs_app_threads.cpp
Normal file
|
@ -0,0 +1,149 @@
|
||||||
|
/**
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013-2020 Winlin
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to
|
||||||
|
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||||
|
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||||
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <srs_app_threads.hpp>
|
||||||
|
|
||||||
|
#include <srs_app_config.hpp>
|
||||||
|
#include <srs_app_hybrid.hpp>
|
||||||
|
#include <srs_app_utility.hpp>
|
||||||
|
#include <srs_kernel_utility.hpp>
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
#include <srs_protocol_kbps.hpp>
|
||||||
|
|
||||||
|
extern SrsPps* _srs_pps_snack2;
|
||||||
|
extern SrsPps* _srs_pps_snack3;
|
||||||
|
extern SrsPps* _srs_pps_snack4;
|
||||||
|
|
||||||
|
SrsPps* _srs_pps_aloss2 = new SrsPps();
|
||||||
|
|
||||||
|
SrsCircuitBreaker::SrsCircuitBreaker()
|
||||||
|
{
|
||||||
|
enabled_ = false;
|
||||||
|
high_threshold_ = 0;
|
||||||
|
high_pulse_ = 0;
|
||||||
|
critical_threshold_ = 0;
|
||||||
|
critical_pulse_ = 0;
|
||||||
|
dying_threshold_ = 0;
|
||||||
|
dying_pulse_ = 0;
|
||||||
|
|
||||||
|
hybrid_high_water_level_ = 0;
|
||||||
|
hybrid_critical_water_level_ = 0;
|
||||||
|
hybrid_dying_water_level_ = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
SrsCircuitBreaker::~SrsCircuitBreaker()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
srs_error_t SrsCircuitBreaker::initialize()
|
||||||
|
{
|
||||||
|
srs_error_t err = srs_success;
|
||||||
|
|
||||||
|
enabled_ = _srs_config->get_circuit_breaker();
|
||||||
|
high_threshold_ = _srs_config->get_high_threshold();
|
||||||
|
high_pulse_ = _srs_config->get_high_pulse();
|
||||||
|
critical_threshold_ = _srs_config->get_critical_threshold();
|
||||||
|
critical_pulse_ = _srs_config->get_critical_pulse();
|
||||||
|
dying_threshold_ = _srs_config->get_dying_threshold();
|
||||||
|
dying_pulse_ = _srs_config->get_dying_pulse();
|
||||||
|
|
||||||
|
// Update the water level for circuit breaker.
|
||||||
|
// @see SrsCircuitBreaker::on_timer()
|
||||||
|
_srs_hybrid->timer1s()->subscribe(this);
|
||||||
|
|
||||||
|
srs_trace("CircuitBreaker: enabled=%d, high=%dx%d, critical=%dx%d, dying=%dx%d", enabled_,
|
||||||
|
high_pulse_, high_threshold_, critical_pulse_, critical_threshold_,
|
||||||
|
dying_pulse_, dying_threshold_);
|
||||||
|
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SrsCircuitBreaker::hybrid_high_water_level()
|
||||||
|
{
|
||||||
|
return enabled_ && hybrid_critical_water_level() || hybrid_high_water_level_;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SrsCircuitBreaker::hybrid_critical_water_level()
|
||||||
|
{
|
||||||
|
return enabled_ && hybrid_dying_water_level() || hybrid_critical_water_level_;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SrsCircuitBreaker::hybrid_dying_water_level()
|
||||||
|
{
|
||||||
|
return enabled_ && dying_pulse_ && hybrid_dying_water_level_ >= dying_pulse_;
|
||||||
|
}
|
||||||
|
|
||||||
|
srs_error_t SrsCircuitBreaker::on_timer(srs_utime_t interval)
|
||||||
|
{
|
||||||
|
srs_error_t err = srs_success;
|
||||||
|
|
||||||
|
// Update the CPU usage.
|
||||||
|
srs_update_proc_stat();
|
||||||
|
SrsProcSelfStat* stat = srs_get_self_proc_stat();
|
||||||
|
|
||||||
|
// Reset the high water-level when CPU is low for N times.
|
||||||
|
if (stat->percent * 100 > high_threshold_) {
|
||||||
|
hybrid_high_water_level_ = high_pulse_;
|
||||||
|
} else if (hybrid_high_water_level_ > 0) {
|
||||||
|
hybrid_high_water_level_--;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset the critical water-level when CPU is low for N times.
|
||||||
|
if (stat->percent * 100 > critical_threshold_) {
|
||||||
|
hybrid_critical_water_level_ = critical_pulse_;
|
||||||
|
} else if (hybrid_critical_water_level_ > 0) {
|
||||||
|
hybrid_critical_water_level_--;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset the dying water-level when CPU is low for N times.
|
||||||
|
if (stat->percent * 100 > dying_threshold_) {
|
||||||
|
hybrid_dying_water_level_ = srs_min(dying_pulse_ + 1, hybrid_dying_water_level_ + 1);
|
||||||
|
} else if (hybrid_dying_water_level_ > 0) {
|
||||||
|
hybrid_dying_water_level_ = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show statistics for RTC server.
|
||||||
|
SrsProcSelfStat* u = srs_get_self_proc_stat();
|
||||||
|
// Resident Set Size: number of pages the process has in real memory.
|
||||||
|
int memory = (int)(u->rss * 4 / 1024);
|
||||||
|
|
||||||
|
// The hybrid thread cpu and memory.
|
||||||
|
float thread_percent = stat->percent * 100;
|
||||||
|
|
||||||
|
if (enabled_ && hybrid_high_water_level() || hybrid_critical_water_level() || _srs_pps_snack2->r10s()) {
|
||||||
|
srs_trace("CircuitBreaker: cpu=%.2f%%,%dMB, break=%d,%d,%d, cond=%.2f%%, snk=%d,%d,%d",
|
||||||
|
u->percent * 100, memory,
|
||||||
|
hybrid_high_water_level(), hybrid_critical_water_level(), hybrid_dying_water_level(), // Whether Circuit-Break is enable.
|
||||||
|
thread_percent, // The conditions to enable Circuit-Breaker.
|
||||||
|
_srs_pps_snack2->r10s(), _srs_pps_snack3->r10s(), _srs_pps_snack4->r10s() // NACK packet,seqs sent.
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
SrsCircuitBreaker* _srs_circuit_breaker = new SrsCircuitBreaker();
|
||||||
|
|
67
trunk/src/app/srs_app_threads.hpp
Normal file
67
trunk/src/app/srs_app_threads.hpp
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
/**
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013-2020 Winlin
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to
|
||||||
|
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||||
|
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||||
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef SRS_APP_THREADS_HPP
|
||||||
|
#define SRS_APP_THREADS_HPP
|
||||||
|
|
||||||
|
#include <srs_core.hpp>
|
||||||
|
|
||||||
|
#include <srs_app_hourglass.hpp>
|
||||||
|
|
||||||
|
// Protect server in high load.
|
||||||
|
class SrsCircuitBreaker : public ISrsFastTimer
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
// The config for high/critical water level.
|
||||||
|
bool enabled_;
|
||||||
|
int high_threshold_;
|
||||||
|
int high_pulse_;
|
||||||
|
int critical_threshold_;
|
||||||
|
int critical_pulse_;
|
||||||
|
int dying_threshold_;
|
||||||
|
int dying_pulse_;
|
||||||
|
private:
|
||||||
|
// Reset the water-level when CPU is low for N times.
|
||||||
|
// @note To avoid the CPU change rapidly.
|
||||||
|
int hybrid_high_water_level_;
|
||||||
|
int hybrid_critical_water_level_;
|
||||||
|
int hybrid_dying_water_level_;
|
||||||
|
public:
|
||||||
|
SrsCircuitBreaker();
|
||||||
|
virtual ~SrsCircuitBreaker();
|
||||||
|
public:
|
||||||
|
srs_error_t initialize();
|
||||||
|
public:
|
||||||
|
// Whether hybrid server water-level is high.
|
||||||
|
bool hybrid_high_water_level();
|
||||||
|
bool hybrid_critical_water_level();
|
||||||
|
bool hybrid_dying_water_level();
|
||||||
|
// interface ISrsFastTimer
|
||||||
|
private:
|
||||||
|
srs_error_t on_timer(srs_utime_t interval);
|
||||||
|
};
|
||||||
|
|
||||||
|
extern SrsCircuitBreaker* _srs_circuit_breaker;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -26,6 +26,6 @@
|
||||||
|
|
||||||
#define VERSION_MAJOR 4
|
#define VERSION_MAJOR 4
|
||||||
#define VERSION_MINOR 0
|
#define VERSION_MINOR 0
|
||||||
#define VERSION_REVISION 102
|
#define VERSION_REVISION 103
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -54,6 +54,7 @@ using namespace std;
|
||||||
#include <srs_core_autofree.hpp>
|
#include <srs_core_autofree.hpp>
|
||||||
#include <srs_kernel_file.hpp>
|
#include <srs_kernel_file.hpp>
|
||||||
#include <srs_app_hybrid.hpp>
|
#include <srs_app_hybrid.hpp>
|
||||||
|
#include <srs_app_threads.hpp>
|
||||||
#ifdef SRS_RTC
|
#ifdef SRS_RTC
|
||||||
#include <srs_app_rtc_conn.hpp>
|
#include <srs_app_rtc_conn.hpp>
|
||||||
#include <srs_app_rtc_server.hpp>
|
#include <srs_app_rtc_server.hpp>
|
||||||
|
@ -479,6 +480,11 @@ srs_error_t run_hybrid_server()
|
||||||
return srs_error_wrap(err, "hybrid initialize");
|
return srs_error_wrap(err, "hybrid initialize");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Circuit breaker to protect server, which depends on hybrid.
|
||||||
|
if ((err = _srs_circuit_breaker->initialize()) != srs_success) {
|
||||||
|
return srs_error_wrap(err, "init circuit breaker");
|
||||||
|
}
|
||||||
|
|
||||||
// Should run util hybrid servers all done.
|
// Should run util hybrid servers all done.
|
||||||
if ((err = _srs_hybrid->run()) != srs_success) {
|
if ((err = _srs_hybrid->run()) != srs_success) {
|
||||||
return srs_error_wrap(err, "hybrid run");
|
return srs_error_wrap(err, "hybrid run");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue