Skip to content

CDRIVER-4615 use polling monitoring in FaaS environments #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 16, 2023
Merged

CDRIVER-4615 use polling monitoring in FaaS environments #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b7f8ee
Check for FaaS
adriandole Jul 20, 2023
4d79d3c
Test revert to polling monitoring
adriandole Jul 26, 2023
0fb31bf
Reset env
adriandole Jul 26, 2023
6bb3a81
Comment on switching to polling
adriandole Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/libmongoc/src/mongoc/mongoc-server-monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "mongoc/mcd-rpc.h"
#include "mongoc/mongoc-client-private.h"
#include "mongoc/mongoc-error-private.h"
#include "mongoc/mongoc-handshake-private.h"
#include "mongoc/mongoc-ssl-private.h"
#include "mongoc/mongoc-stream-private.h"
#include "mongoc/mongoc-topology-background-monitoring-private.h"
Expand Down Expand Up @@ -1073,7 +1074,11 @@ _server_monitor_check_server (
GOTO (exit);
}

if (!bson_empty (&previous_description->topology_version)) {
if (!bson_empty (&previous_description->topology_version) &&
_mongoc_handshake_get ()->env == MONGOC_HANDSHAKE_ENV_NONE) {
// Use stream monitoring if:
// - Server supports stream monitoring (indicated by `topologyVersion`).
// - Application is not in an FaaS environment (e.g. AWS Lambda).
awaited = true;
_server_monitor_heartbeat_started (server_monitor, awaited);
MONITOR_LOG (server_monitor, "awaitable hello");
Expand Down
24 changes: 24 additions & 0 deletions src/libmongoc/tests/test-mongoc-background-monitoring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "mongoc/mongoc.h"
#include "mongoc/mongoc-client-pool-private.h"
#include "mongoc/mongoc-client-private.h"
#include "mongoc/mongoc-handshake-private.h"
#include "mongoc/mongoc-server-description-private.h"
#include "mongoc/mongoc-topology-background-monitoring-private.h"
#include "mongoc/mongoc-topology-description-private.h"
Expand Down Expand Up @@ -390,6 +391,25 @@ test_connect_succeeds (void)
tf_destroy (tf);
}

void
test_connect_faas_use_polling (void)
{
test_fixture_t *tf;
mongoc_handshake_t *md = _mongoc_handshake_get ();
md->env = MONGOC_HANDSHAKE_ENV_AWS;

/* This mock server will not respond to streaming hello, so OBSERVE_SOON
will timeout if the server monitor doesn't detect ENV_AWS and switch to
polling */
tf = tf_new (TF_AUTO_RESPOND_POLLING_HELLO);
OBSERVE_SOON (tf, tf->observations->n_heartbeat_succeeded == 2);
OBSERVE_SOON (tf, tf->observations->n_heartbeat_failed == 0);
OBSERVE (tf, !tf->observations->awaited);

tf_destroy (tf);
md->env = MONGOC_HANDSHAKE_ENV_NONE;
}

void
test_connect_hangup (void)
{
Expand Down Expand Up @@ -1134,6 +1154,10 @@ test_monitoring_install (TestSuite *suite)
/* Tests for initial connection. */
TestSuite_AddMockServerTest (
suite, "/server_monitor_thread/connect/succeeds", test_connect_succeeds);
TestSuite_AddMockServerTest (
suite,
"/server_monitor_thread/connect/faas_use_polling",
test_connect_faas_use_polling);
TestSuite_AddMockServerTest (
suite, "/server_monitor_thread/connect/hangup", test_connect_hangup);
TestSuite_AddMockServerTest (
Expand Down