ape: Initialize and use policy contract interface #871

aarifullin · 2023-12-14T12:17:58Z

aarifullin commented

2023-12-14 12:17:58 +00:00

Replace inmemory policy contract implementation by initialized policy contract interface.

Close #851

Replace inmemory policy contract implementation by initialized policy contract interface. Close #851

aarifullin requested review from storage-core-committers 2023-12-14 12:18:29 +00:00

aarifullin reviewed 2023-12-14 12:18:58 +00:00

go.mod Outdated

					
				@ -2,6 +2,8 @@ module git.frostfs.info/TrueCloudLab/frostfs-node

				go 1.20

				replace git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20231211080303-8c673ee4f4af => git.frostfs.info/aarifullin/policy-engine v0.0.0-20231212185618-def903261503

aarifullin commented

2023-12-14 12:18:58 +00:00

Waits for ape #32

Waits for [ape #32](https://git.frostfs.info/TrueCloudLab/policy-engine/pulls/32)

aarifullin marked this conversation as resolved

aarifullin requested review from storage-core-developers 2023-12-14 12:21:06 +00:00

aarifullin force-pushed feature/851-use_policy_contract from e10d2bdaba to f7ee4846d3

2023-12-14 13:06:20 +00:00

Compare

dstepanov-yadro approved these changes 2023-12-14 13:33:12 +00:00

aarifullin requested review from storage-core-committers 2023-12-15 11:36:05 +00:00

dstepanov-yadro approved these changes 2023-12-15 11:45:51 +00:00

acid-ant approved these changes 2023-12-15 12:05:44 +00:00

fyrchik reviewed 2023-12-18 07:15:59 +00:00

cmd/frostfs-node/main.go Outdated

					
				@ -98,14 +98,15 @@ func initApp(ctx context.Context, c *cfg) {

						fatalOnErr(c.cfgObject.cfgLocalStorage.localStorage.Init(ctx))

					})

					initAndLog(c, "gRPC", initGRPC)

fyrchik commented

2023-12-18 07:15:12 +00:00

Why this change?

aarifullin commented

2023-12-18 08:28:43 +00:00

initNetmapService -> initMorphComponents -> c.cfgMorph.client = cli

And then use it for initAccessPolicyEngine(ctx, c) ->

morphRuleStorage := policy_client.NewContractStorage(
		c.cfgMorph.client.GetActor(),
		c.cfgObject.cfgAccessPolicyEngine.policyContractHash)

`initNetmapService` -> `initMorphComponents` -> `c.cfgMorph.client = cli` And then use it for `initAccessPolicyEngine(ctx, c)` -> ```go morphRuleStorage := policy_client.NewContractStorage( c.cfgMorph.client.GetActor(), c.cfgObject.cfgAccessPolicyEngine.policyContractHash) ```

fyrchik commented

2023-12-18 11:04:28 +00:00

Oh, it is ape initialization below, storage engine is still before services, ok.

fyrchik marked this conversation as resolved

pkg/morph/client/client.go Outdated

					
				@ -541,1 +541,4 @@

				}

				func (c *Client) GetActor() *actor.Actor {

					return c.rpcActor

fyrchik commented

2023-12-18 07:14:48 +00:00

How thread-safe is it?

aarifullin commented

2023-12-18 08:41:58 +00:00

I have add rwMutext locking before getting c.rpcActor.

You're right: this is not sensitive during initialization but can lead to UB if GetActor() is used in other cases

I have add rwMutext locking before getting `c.rpcActor`. You're right: this is not sensitive during initialization but can lead to UB if `GetActor()` is used in other cases

fyrchik marked this conversation as resolved

aarifullin force-pushed feature/851-use_policy_contract from f7ee4846d3 to 6e6eb92d17

2023-12-18 08:40:27 +00:00

Compare

aarifullin requested review from dstepanov-yadro 2023-12-18 09:09:00 +00:00

aarifullin requested review from acid-ant 2023-12-18 09:09:01 +00:00

fyrchik approved these changes 2023-12-18 11:05:25 +00:00

fyrchik merged commit 7d7cf05575 into master

2023-12-18 11:06:37 +00:00

Sign in to join this conversation.

No reviewers