Skip to content

Add discovery mutator for underlay #566

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 3 commits into from
Dec 26, 2023
Merged

Add discovery mutator for underlay #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ebb0bb
Add discovery mutator for underlay
kardymonds Dec 19, 2023
33e4273
Fix prefix
kardymonds Dec 19, 2023
2093d78
TString -> StringBuf
kardymonds Dec 26, 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
28 changes: 26 additions & 2 deletions ydb/core/fq/libs/shared_resources/shared_resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#include "shared_resources.h"

#include <ydb/library/services/services.pb.h>
#include <ydb/core/fq/libs/events/events.h>
#include <ydb/library/actors/core/actorsystem.h>
#include <ydb/library/logger/actor.h>
#include <ydb/library/services/services.pb.h>

#include <ydb/library/actors/core/actorsystem.h>
#include <ydb/public/api/protos/ydb_discovery.pb.h>
#include <ydb/public/sdk/cpp/client/extensions/discovery_mutator/discovery_mutator.h>

#include <util/generic/cast.h>
#include <util/generic/strbuf.h>
Expand Down Expand Up @@ -33,6 +35,7 @@ struct TYqSharedResourcesImpl : public TActorSystemPtrMixin, public TYqSharedRes
: TYqSharedResources(NYdb::TDriver(GetYdbDriverConfig(config.GetCommon().GetYdbDriverConfig())))
{
CreateDbPoolHolder(PrepareDbPoolConfig(config), credentialsProviderFactory, counters);
AddUnderlayDiscoveryMutator();
}

NDbPool::TConfig PrepareDbPoolConfig(const NFq::NConfig::TConfig& config) {
Expand Down Expand Up @@ -81,6 +84,27 @@ struct TYqSharedResourcesImpl : public TActorSystemPtrMixin, public TYqSharedRes
const ::NMonitoring::TDynamicCounterPtr& counters) {
DbPoolHolder = MakeIntrusive<NDbPool::TDbPoolHolder>(config, CoreYdbDriver, credentialsProviderFactory, counters);
}

void AddUnderlayDiscoveryMutator() {

auto mutator = [](Ydb::Discovery::ListEndpointsResult* proto, NYdb::TStatus status, const NYdb::IDiscoveryMutatorApi::TAuxInfo& aux) {
TStringBuf underlayPrefix{"u-"};
if (!aux.DiscoveryEndpoint.starts_with(underlayPrefix) || !proto) {
return status;
}

for (size_t i = 0; i < proto->endpointsSize(); ++i) {
Ydb::Discovery::EndpointInfo* endpointInfo = proto->Mutableendpoints(i);
const TString& address = endpointInfo->address();
if (address.StartsWith(underlayPrefix)) {
continue;
}
endpointInfo->set_address(underlayPrefix + address);
}
return status;
};
UserSpaceYdbDriver.AddExtension<NDiscoveryMutator::TDiscoveryMutator>(NDiscoveryMutator::TDiscoveryMutator::TParams(std::move(mutator)));
}
};

} // namespace
Expand Down
1 change: 1 addition & 0 deletions ydb/core/fq/libs/shared_resources/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ PEERDIR(
ydb/library/logger
ydb/library/security
ydb/public/sdk/cpp/client/ydb_driver
ydb/public/sdk/cpp/client/ydb_extension
ydb/public/sdk/cpp/client/ydb_table
)

Expand Down