[#31] Client: fix for session

Signed-off-by: Pavel Gross <p.gross@yadro.com>

src/FrostFS.SDK.Tests/Smoke/SmokeClientTests.cs

@@ -7,6 +7,7 @@ using FrostFS.SDK.Client;
 using FrostFS.SDK.Client.Interfaces;
 using FrostFS.SDK.Cryptography;
 using FrostFS.SDK.SmokeTests;
+using FrostFS.Session;
 using Google.Protobuf;
 using Microsoft.Extensions.Options;
 
@@ -21,6 +22,8 @@ public class SmokeClientTests : SmokeTestsBase
     [Fact]
     public async void AccountTest()
     {
+        var test = lightWait.Timeout;
+
         var client = FrostFSClient.GetInstance(ClientOptions, GrpcChannel);
 
         var result = await client.GetBalanceAsync(default);
@@ -66,8 +69,6 @@ public class SmokeClientTests : SmokeTestsBase
 
         var token = await client.CreateSessionAsync(new(100), default);
 
-        var ownerHash = Base58.Decode(OwnerId!.Value);
-
         Assert.NotNull(token);
         Assert.NotEqual(Guid.Empty, token.Id);
         Assert.Equal(33, token.SessionKey.Length);
@@ -84,7 +85,7 @@ public class SmokeClientTests : SmokeTestsBase
 
         var createContainerParam = new PrmContainerCreate(
              new FrostFsContainerInfo(
-                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
+                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(3)),
                     [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
             PrmWait.DefaultParams,
             xheaders: ["key1", "value1"]);
@@ -133,7 +134,7 @@ public class SmokeClientTests : SmokeTestsBase
 
         var createContainerParam = new PrmContainerCreate(
             new FrostFsContainerInfo(
-                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
+                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(3)),
                     [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
            lightWait);
 
@@ -221,7 +222,7 @@ public class SmokeClientTests : SmokeTestsBase
 
         var createContainerParam = new PrmContainerCreate(
             new FrostFsContainerInfo(
-                new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
+                new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(3)),
                 [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
             PrmWait.DefaultParams,
             xheaders: ["testKey", "testValue"]);
@@ -285,6 +286,81 @@ public class SmokeClientTests : SmokeTestsBase
         }
 
         Assert.Equal(SHA256.HashData(bytes), SHA256.HashData(downloadedBytes));
+    }
+
+    [Theory]
+    [InlineData(1)]
+    [InlineData(500 * 1024)]
+    [InlineData(3 * 1024 * 1024)]
+    public async void PutSingleObjectTest(int objectSize)
+    {
+        var options = ClientOptions;
+
+        var client = FrostFSClient.GetInstance(options, GrpcChannel);
+
+        await Cleanup(client);
+
+        var ctx = new CallContext();
+
+        var createContainerParam = new PrmContainerCreate(
+            new FrostFsContainerInfo(
+                new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(3)),
+                [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
+            PrmWait.DefaultParams,
+            xheaders: ["testKey1", "testValue1"]);
+
+        var containerId = await client.CreateContainerAsync(createContainerParam, ctx);
+
+        var container = await client.GetContainerAsync(new PrmContainerGet(containerId), default);
+        Assert.NotNull(container);
+     
+        await AddObjectRules(client, containerId);
+
+        var bytes = GetRandomBytes(objectSize);
+
+        var header = new FrostFsObjectHeader(
+                       containerId: containerId,
+                       type: FrostFsObjectType.Regular,
+                       [new FrostFsAttributePair("fileName1", "test1")]);
+
+        var obj = new FrostFsObject(header) { SingleObjectPayload = bytes };
+
+        var param = new PrmSingleObjectPut(obj);
+
+        var objectId = await client.PutSingleObjectAsync(param, default).ConfigureAwait(true);
+
+        var filter = new FilterByAttributePair(FrostFsMatchType.Equals, "fileName1", "test1");
+
+        bool hasObject = false;
+        await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, null, [], filter), default))
+        {
+            hasObject = true;
+
+            var res = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId), default);
+
+            var objHeader = res.HeaderInfo;
+            Assert.NotNull(objHeader);
+            Assert.Equal((ulong)bytes.Length, objHeader.PayloadLength);
+            Assert.NotNull(objHeader.Attributes);
+            Assert.Single(objHeader.Attributes);
+            Assert.Equal("fileName1", objHeader.Attributes.First().Key);
+            Assert.Equal("test1", objHeader.Attributes.First().Value);
+        }
+
+        Assert.True(hasObject);
+
+        var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId), default);
+
+        var downloadedBytes = new byte[@object.Header.PayloadLength];
+        MemoryStream ms = new(downloadedBytes);
+
+        ReadOnlyMemory<byte>? chunk = null;
+        while ((chunk = await @object.ObjectReader!.ReadChunk()) != null)
+        {
+            ms.Write(chunk.Value.Span);
+        }
+
+        Assert.Equal(SHA256.HashData(bytes), SHA256.HashData(downloadedBytes));
 
         await Cleanup(client);
 
@@ -294,6 +370,14 @@ public class SmokeClientTests : SmokeTestsBase
         }
     }
 
+    [Fact]
+    public async void CleanupTest()
+    {
+        var client = FrostFSClient.GetInstance(ClientOptions, GrpcChannel);
+
+        await Cleanup(client);
+    }
+
     [Fact]
     public async void PatchTest()
     {
@@ -387,7 +471,7 @@ public class SmokeClientTests : SmokeTestsBase
 
         var createContainerParam = new PrmContainerCreate(
              new FrostFsContainerInfo(
-                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
+                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(3)),
                     [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
             PrmWait.DefaultParams,
             xheaders: ["testKey", "testValue"]);
@@ -429,13 +513,6 @@ public class SmokeClientTests : SmokeTestsBase
         }
 
         Assert.Equal(SHA256.HashData(bytes.AsSpan().Slice(50, 100)), SHA256.HashData(downloadedBytes));
-
-        await Cleanup(client);
-
-        await foreach (var _ in client.ListContainersAsync(default, default))
-        {
-            Assert.Fail("Containers exist");
-        }
     }
 
     [Fact]
@@ -447,7 +524,7 @@ public class SmokeClientTests : SmokeTestsBase
 
         var createContainerParam = new PrmContainerCreate(
              new FrostFsContainerInfo(
-                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
+                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(3)),
                     [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
             PrmWait.DefaultParams,
             xheaders: ["testKey", "testValue"]);
@@ -482,13 +559,8 @@ public class SmokeClientTests : SmokeTestsBase
         foreach (var hash in hashes)
         {
             var x = hash[..32].ToArray();
-        }
-
-        await Cleanup(client);
-
-        await foreach (var _ in client.ListContainersAsync(default, default))
-        {
-            Assert.Fail("Containers exist");
+            Assert.NotNull(x);
+            Assert.True(x.Length > 0);
         }
     }
 
@@ -499,7 +571,7 @@ public class SmokeClientTests : SmokeTestsBase
     public async void SimpleScenarioWithSessionTest(int objectSize)
     {
         var client = FrostFSClient.GetInstance(ClientOptions, GrpcChannel);
-        //Callback = new((CallStatistics cs) => Assert.True(cs.ElapsedMicroSeconds > 0))
+     
         var token = await client.CreateSessionAsync(new PrmSessionCreate(int.MaxValue), default);
 
         await Cleanup(client);
@@ -508,7 +580,7 @@ public class SmokeClientTests : SmokeTestsBase
 
         var createContainerParam = new PrmContainerCreate(
              new FrostFsContainerInfo(
-                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
+                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(3)),
                     [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
             PrmWait.DefaultParams);
 
@@ -574,14 +646,8 @@ public class SmokeClientTests : SmokeTestsBase
         }
     }
 
-    [Theory]
-    [InlineData(1)]
-    [InlineData(64 * 1024 * 1024)]      // exactly 1 block size - 64MB
-    [InlineData(64 * 1024 * 1024 - 1)]
-    [InlineData(64 * 1024 * 1024 + 1)]
-    [InlineData(2 * 64 * 1024 * 1024 + 256)]
-    [InlineData(200)]
-    public async void ClientCutScenarioTest(int objectSize)
+    [Fact]
+    public async void ClientCutScenarioTest()
     {
         var options = ClientOptions;
         options.Value.Interceptors.Add(new CallbackInterceptor());
@@ -590,71 +656,57 @@ public class SmokeClientTests : SmokeTestsBase
 
         await Cleanup(client);
 
-        var createContainerParam = new PrmContainerCreate(
-             new FrostFsContainerInfo(
-                    new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(1)),
-                    [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
-            lightWait);
+        int[] replicas = [3]; //1
 
-        var containerId = await client.CreateContainerAsync(createContainerParam, default);
-
-        var ctx = new CallContext(TimeSpan.FromSeconds(10));
-
-        var container = await client.GetContainerAsync(new PrmContainerGet(containerId), ctx);
-
-        Assert.NotNull(container);
-
-        await AddObjectRules(client, containerId);
-
-        byte[] bytes = GetRandomBytes(objectSize);
-
-        var param = new PrmObjectClientCutPut(
-            new FrostFsObjectHeader(
-                containerId: containerId,
-                type: FrostFsObjectType.Regular,
-                [new FrostFsAttributePair("fileName", "test")]),
-            payload: new MemoryStream(bytes));
-
-        var objectId = await client.PutClientCutObjectAsync(param, default).ConfigureAwait(true);
-
-        var filter1 = new FilterByOwnerId(FrostFsMatchType.Equals, OwnerId!);
-        await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, null, [], filter1), default))
+        foreach (var rep in replicas)
         {
-            var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId, false), default);
-        }
+            var createContainerParam = new PrmContainerCreate(
+                 new FrostFsContainerInfo(
+                        new FrostFsPlacementPolicy(true, 1, [], [], new FrostFsReplica(rep)),
+                        [new FrostFsAttributePair("__SYSTEM__DISABLE_HOMOMORPHIC_HASHING", "true")]),
+                lightWait);
 
-        var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId), default);
+            var containerId = await client.CreateContainerAsync(createContainerParam, default);
 
-        var downloadedBytes = new byte[@object.Header.PayloadLength];
-        MemoryStream ms = new(downloadedBytes);
+            var ctx = new CallContext(TimeSpan.FromSeconds(10));
 
-        ReadOnlyMemory<byte>? chunk = null;
-        while ((chunk = await @object.ObjectReader!.ReadChunk()) != null)
-        {
-            ms.Write(chunk.Value.Span);
-        }
+            var container = await client.GetContainerAsync(new PrmContainerGet(containerId), ctx);
 
-        Assert.Equal(SHA256.HashData(bytes), SHA256.HashData(downloadedBytes));
+            Assert.NotNull(container);
 
-        await CheckFilter(client, containerId, new FilterByRootObject());
+            await AddObjectRules(client, containerId);
+           
+            var mb = 1024 * 1024;
 
-        await Cleanup(client);
+            int[] objectSizes = [1, 1024, 64 * mb + 1];  //64 * mb, 64 * mb - 1, , 2 * 64 * mb + 256];
 
-        var deadline = DateTime.UtcNow.Add(TimeSpan.FromSeconds(5));
-
-        IAsyncEnumerator<FrostFsContainerId>? enumerator = null;
-        do
-        {
-            if (deadline <= DateTime.UtcNow)
+            foreach (var objectSize in objectSizes)
             {
-                Assert.Fail("Containers exist");
-                break;
-            }
+                byte[] bytes = GetRandomBytes(objectSize);
 
-            enumerator = client.ListContainersAsync(default, default).GetAsyncEnumerator();
-            await Task.Delay(500);
+                var param = new PrmObjectClientCutPut(
+                    new FrostFsObjectHeader(
+                        containerId: containerId,
+                        type: FrostFsObjectType.Regular,
+                        [new FrostFsAttributePair("fileName", "test")]),
+                    payload: new MemoryStream(bytes));
+
+                var objectId = await client.PutClientCutObjectAsync(param, default).ConfigureAwait(true);
+
+                var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId), default);
+
+                var downloadedBytes = new byte[@object.Header.PayloadLength];
+                MemoryStream ms = new(downloadedBytes);
+
+                ReadOnlyMemory<byte>? chunk = null;
+                while ((chunk = await @object.ObjectReader!.ReadChunk()) != null)
+                {
+                    ms.Write(chunk.Value.Span);
+                }
+
+                Assert.Equal(SHA256.HashData(bytes), SHA256.HashData(downloadedBytes));
+            }
         }
-        while (await enumerator!.MoveNextAsync());
     }
 
     [Fact]
@@ -712,6 +764,43 @@ public class SmokeClientTests : SmokeTestsBase
         }
     }
 
+    private static async Task AddContainerRules(IFrostFSClient client, FrostFsContainerId containerId)
+    {
+        var addChainPrm = new PrmApeChainAdd(
+           new FrostFsChainTarget(FrostFsTargetType.Container, containerId.GetValue()),
+           new FrostFsChain
+           {
+               ID = Encoding.ASCII.GetBytes("chain-id-test1"),
+               Rules = [
+                    new FrostFsRule
+                        {
+                            Status = RuleStatus.Allow,
+                            Actions = new Actions(inverted: false, names: ["*"]),
+                            Resources = new Resource (inverted: false, names: [$"native:container/*"]),
+                            Any = false,
+                            Conditions = []
+                        }
+               ],
+               MatchType = RuleMatchType.DenyPriority
+           }
+       );
+
+        await client.AddChainAsync(addChainPrm, default);
+
+        var listChainPrm = new PrmApeChainList(new FrostFsChainTarget(FrostFsTargetType.Container, containerId.GetValue()));
+
+        while (true)
+        {
+            await Task.Delay(1000);
+            var chains = await client.ListChainAsync(listChainPrm, default);
+
+            if (chains.Length > 0)
+                break;
+        }
+
+        await Task.Delay(8000);
+    }
+
     private static async Task AddObjectRules(IFrostFSClient client, FrostFsContainerId containerId)
     {
         var addChainPrm = new PrmApeChainAdd(
@@ -735,17 +824,6 @@ public class SmokeClientTests : SmokeTestsBase
 
         await client.AddChainAsync(addChainPrm, default);
 
-        var listChainPrm = new PrmApeChainList(new FrostFsChainTarget(FrostFsTargetType.Container, containerId.GetValue()));
-
-        while (true)
-        {
-            await Task.Delay(1000);
-            var chains = await client.ListChainAsync(listChainPrm, default);
-
-            if (chains.Length > 0)
-                break;
-        }
-        
         await Task.Delay(8000);
     }
 }

src/FrostFS.SDK.Tests/Smoke/SmokeTestsBase.cs

@@ -11,9 +11,14 @@ namespace FrostFS.SDK.Tests.Smoke;
 
 public abstract class SmokeTestsBase
 {
+    // cluster Ori
+    internal readonly string url = "http://10.78.128.207:8080";
+    internal readonly string keyString = "L4JWLdedUd4b21sriRHtCPGkjG2Mryz2AWLiVqTBSNyxxyAUcc7s";
+
+
     // cluster
-    internal readonly string url = "http://10.78.128.190:8080";
-    internal readonly string keyString = "L47c3bunc6bJd7uEAfPUae2VkyupFR9nizoH6jfPonzQxijqH2Ba";
+    // internal readonly string url = "http://10.78.128.190:8080";
+    // internal readonly string keyString = "L47c3bunc6bJd7uEAfPUae2VkyupFR9nizoH6jfPonzQxijqH2Ba";
 
     // WSL2
     //internal readonly string url = "http://172.29.238.97:8080";