2020-03-30 15:19:36 +01:00
|
|
|
// Copyright (C) 2020 Storj Labs, Inc.
|
|
|
|
// See LICENSE for copying information.
|
|
|
|
|
|
|
|
package metainfo_test
|
|
|
|
|
|
|
|
import (
|
2020-07-24 10:40:17 +01:00
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"strconv"
|
2020-03-30 15:19:36 +01:00
|
|
|
"testing"
|
2020-07-20 10:40:12 +01:00
|
|
|
"time"
|
2020-03-30 15:19:36 +01:00
|
|
|
|
2020-04-14 09:27:43 +01:00
|
|
|
"github.com/stretchr/testify/assert"
|
2020-03-30 15:19:36 +01:00
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
|
2020-04-14 12:50:50 +01:00
|
|
|
"storj.io/common/memory"
|
2020-03-30 15:19:36 +01:00
|
|
|
"storj.io/common/pb"
|
|
|
|
"storj.io/common/testcontext"
|
|
|
|
"storj.io/common/testrand"
|
2020-03-30 10:08:50 +01:00
|
|
|
"storj.io/common/uuid"
|
2020-03-30 15:19:36 +01:00
|
|
|
"storj.io/storj/private/testplanet"
|
2020-07-24 10:40:17 +01:00
|
|
|
"storj.io/storj/satellite/attribution"
|
|
|
|
"storj.io/storj/satellite/console"
|
2020-04-14 12:50:50 +01:00
|
|
|
"storj.io/uplink"
|
2020-03-30 15:19:36 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestResolvePartnerID(t *testing.T) {
|
|
|
|
testplanet.Run(t, testplanet.Config{
|
|
|
|
SatelliteCount: 1, StorageNodeCount: 0, UplinkCount: 0,
|
|
|
|
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {
|
|
|
|
endpoint := planet.Satellites[0].Metainfo.Endpoint2
|
|
|
|
|
2020-04-02 13:30:43 +01:00
|
|
|
zenkoPartnerID, err := uuid.FromString("8cd605fa-ad00-45b6-823e-550eddc611d6")
|
2020-03-30 15:19:36 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
// no header
|
2020-06-15 13:26:21 +01:00
|
|
|
_, err = endpoint.ResolvePartnerID(ctx, nil)
|
2020-03-30 15:19:36 +01:00
|
|
|
require.Error(t, err)
|
|
|
|
|
2020-04-14 12:50:50 +01:00
|
|
|
partnerID, err := endpoint.ResolvePartnerID(ctx, &pb.RequestHeader{
|
2020-03-30 15:19:36 +01:00
|
|
|
UserAgent: []byte("not-a-partner"),
|
2020-06-15 13:26:21 +01:00
|
|
|
})
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uuid.UUID{}, partnerID)
|
2020-03-30 15:19:36 +01:00
|
|
|
|
2020-04-14 12:50:50 +01:00
|
|
|
partnerID, err = endpoint.ResolvePartnerID(ctx, &pb.RequestHeader{
|
2020-03-30 15:19:36 +01:00
|
|
|
UserAgent: []byte("Zenko"),
|
2020-06-15 13:26:21 +01:00
|
|
|
})
|
2020-03-30 15:19:36 +01:00
|
|
|
require.NoError(t, err)
|
2020-04-02 13:30:43 +01:00
|
|
|
require.Equal(t, zenkoPartnerID, partnerID)
|
2020-03-30 15:19:36 +01:00
|
|
|
|
|
|
|
partnerID, err = endpoint.ResolvePartnerID(ctx, &pb.RequestHeader{
|
|
|
|
UserAgent: []byte("Zenko uplink/v1.0.0"),
|
2020-06-15 13:26:21 +01:00
|
|
|
})
|
2020-03-30 15:19:36 +01:00
|
|
|
require.NoError(t, err)
|
2020-04-02 13:30:43 +01:00
|
|
|
require.Equal(t, zenkoPartnerID, partnerID)
|
2020-03-30 15:19:36 +01:00
|
|
|
|
|
|
|
partnerID, err = endpoint.ResolvePartnerID(ctx, &pb.RequestHeader{
|
|
|
|
UserAgent: []byte("Zenko uplink/v1.0.0 (drpc/v0.10.0 common/v0.0.0-00010101000000-000000000000)"),
|
2020-06-15 13:26:21 +01:00
|
|
|
})
|
2020-03-30 15:19:36 +01:00
|
|
|
require.NoError(t, err)
|
2020-04-02 13:30:43 +01:00
|
|
|
require.Equal(t, zenkoPartnerID, partnerID)
|
2020-03-30 15:19:36 +01:00
|
|
|
|
|
|
|
partnerID, err = endpoint.ResolvePartnerID(ctx, &pb.RequestHeader{
|
|
|
|
UserAgent: []byte("Zenko uplink/v1.0.0 (drpc/v0.10.0) (common/v0.0.0-00010101000000-000000000000)"),
|
2020-06-15 13:26:21 +01:00
|
|
|
})
|
2020-03-30 15:19:36 +01:00
|
|
|
require.NoError(t, err)
|
2020-04-02 13:30:43 +01:00
|
|
|
require.Equal(t, zenkoPartnerID, partnerID)
|
2020-03-30 15:19:36 +01:00
|
|
|
|
|
|
|
partnerID, err = endpoint.ResolvePartnerID(ctx, &pb.RequestHeader{
|
|
|
|
UserAgent: []byte("uplink/v1.0.0 (drpc/v0.10.0 common/v0.0.0-00010101000000-000000000000)"),
|
2020-06-15 13:26:21 +01:00
|
|
|
})
|
2020-03-30 15:19:36 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, uuid.UUID{}, partnerID)
|
|
|
|
})
|
|
|
|
}
|
2020-04-14 09:27:43 +01:00
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
func TestBucketAttribution(t *testing.T) {
|
2020-04-14 12:50:50 +01:00
|
|
|
testplanet.Run(t, testplanet.Config{
|
|
|
|
SatelliteCount: 1,
|
|
|
|
StorageNodeCount: 1,
|
|
|
|
UplinkCount: 1,
|
|
|
|
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {
|
2020-07-24 10:40:17 +01:00
|
|
|
for i, tt := range []struct {
|
|
|
|
signupPartner string
|
|
|
|
userAgent string
|
|
|
|
expectedAttribution string
|
|
|
|
}{
|
|
|
|
{signupPartner: "", userAgent: "", expectedAttribution: ""},
|
|
|
|
{signupPartner: "Minio", userAgent: "", expectedAttribution: "Minio"},
|
|
|
|
{signupPartner: "Minio", userAgent: "Minio", expectedAttribution: "Minio"},
|
|
|
|
{signupPartner: "Minio", userAgent: "Zenko", expectedAttribution: "Minio"},
|
|
|
|
{signupPartner: "", userAgent: "Zenko", expectedAttribution: "Zenko"},
|
|
|
|
} {
|
|
|
|
errTag := fmt.Sprintf("%d. %+v", i, tt)
|
|
|
|
|
|
|
|
satellite := planet.Satellites[0]
|
|
|
|
|
|
|
|
var signupPartnerID string
|
|
|
|
if tt.signupPartner != "" {
|
|
|
|
partner, err := satellite.API.Marketing.PartnersService.ByName(ctx, tt.signupPartner)
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
signupPartnerID = partner.ID
|
|
|
|
}
|
|
|
|
|
|
|
|
user, err := satellite.AddUser(ctx, console.CreateUser{
|
|
|
|
FullName: "Test User " + strconv.Itoa(i),
|
|
|
|
Email: "user@test" + strconv.Itoa(i),
|
|
|
|
PartnerID: signupPartnerID,
|
|
|
|
}, 1)
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
|
|
|
|
satProject, err := satellite.AddProject(ctx, user.ID, "test"+strconv.Itoa(i))
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
|
|
|
|
authCtx, err := satellite.AuthenticatedContext(ctx, user.ID)
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
|
|
|
|
_, apiKeyInfo, err := satellite.API.Console.Service.CreateAPIKey(authCtx, satProject.ID, "root")
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
|
|
|
|
config := uplink.Config{
|
|
|
|
UserAgent: tt.userAgent,
|
|
|
|
}
|
|
|
|
access, err := config.RequestAccessWithPassphrase(ctx, satellite.NodeURL().String(), apiKeyInfo.Serialize(), "mypassphrase")
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
|
|
|
|
project, err := config.OpenProject(ctx, access)
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
|
|
|
|
_, err = project.CreateBucket(ctx, "bucket")
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
|
|
|
|
var expectedPartnerID uuid.UUID
|
|
|
|
if tt.expectedAttribution != "" {
|
|
|
|
expectedPartner, err := planet.Satellites[0].API.Marketing.PartnersService.ByName(ctx, tt.expectedAttribution)
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
expectedPartnerID = expectedPartner.UUID
|
|
|
|
}
|
|
|
|
|
|
|
|
bucketInfo, err := satellite.DB.Buckets().GetBucket(ctx, []byte("bucket"), satProject.ID)
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
assert.Equal(t, expectedPartnerID, bucketInfo.PartnerID, errTag)
|
|
|
|
|
|
|
|
attributionInfo, err := planet.Satellites[0].DB.Attribution().Get(ctx, satProject.ID, []byte("bucket"))
|
|
|
|
if tt.expectedAttribution == "" {
|
|
|
|
assert.True(t, attribution.ErrBucketNotAttributed.Has(err), errTag)
|
|
|
|
} else {
|
|
|
|
require.NoError(t, err, errTag)
|
|
|
|
assert.Equal(t, expectedPartnerID, attributionInfo.PartnerID, errTag)
|
|
|
|
}
|
2020-04-14 12:50:50 +01:00
|
|
|
}
|
2020-07-24 10:40:17 +01:00
|
|
|
})
|
|
|
|
}
|
2020-04-14 12:50:50 +01:00
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
func TestQueryAttribution(t *testing.T) {
|
|
|
|
testplanet.Run(t, testplanet.Config{
|
|
|
|
SatelliteCount: 1, StorageNodeCount: 4, UplinkCount: 0,
|
|
|
|
Reconfigure: testplanet.Reconfigure{
|
|
|
|
Satellite: testplanet.ReconfigureRS(2, 3, 4, 4),
|
|
|
|
},
|
|
|
|
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {
|
|
|
|
const (
|
|
|
|
bucketName = "test"
|
|
|
|
objectKey = "test-key"
|
|
|
|
)
|
|
|
|
satellite := planet.Satellites[0]
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
now := time.Now()
|
|
|
|
tomorrow := now.Add(24 * time.Hour)
|
2020-04-14 12:50:50 +01:00
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
partner, err := satellite.API.Marketing.PartnersService.ByName(ctx, "Minio")
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
user, err := satellite.AddUser(ctx, console.CreateUser{
|
|
|
|
FullName: "user@test",
|
|
|
|
Email: "user@test",
|
|
|
|
PartnerID: partner.ID,
|
|
|
|
}, 1)
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
satProject, err := satellite.AddProject(ctx, user.ID, "test")
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
authCtx, err := satellite.AuthenticatedContext(ctx, user.ID)
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
_, apiKeyInfo, err := satellite.API.Console.Service.CreateAPIKey(authCtx, satProject.ID, "root")
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
access, err := uplink.RequestAccessWithPassphrase(ctx, satellite.NodeURL().String(), apiKeyInfo.Serialize(), "mypassphrase")
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
project, err := uplink.OpenProject(ctx, access)
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-24 10:40:17 +01:00
|
|
|
_, err = project.CreateBucket(ctx, bucketName)
|
2020-04-14 12:50:50 +01:00
|
|
|
require.NoError(t, err)
|
2020-07-24 10:40:17 +01:00
|
|
|
|
|
|
|
{ // upload and download should be accounted for Minio
|
|
|
|
upload, err := project.UploadObject(ctx, bucketName, objectKey, nil)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
_, err = upload.Write(testrand.Bytes(5 * memory.KiB))
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
err = upload.Commit()
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
download, err := project.DownloadObject(ctx, bucketName, objectKey, nil)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
_, err = ioutil.ReadAll(download)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
err = download.Close()
|
|
|
|
require.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
{ // Flush all the pending information through the system.
|
|
|
|
// Calculate the usage used for upload
|
|
|
|
for _, sn := range planet.StorageNodes {
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
sn.Storage2.Orders.SendOrders(ctx, tomorrow)
|
2020-07-24 10:40:17 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
rollout := planet.Satellites[0].Core.Accounting.ReportedRollupChore
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
require.NoError(t, rollout.RunOnce(ctx, now))
|
2020-07-24 10:40:17 +01:00
|
|
|
|
|
|
|
// Trigger tally so it gets all set up and can return a storage usage
|
|
|
|
planet.Satellites[0].Accounting.Tally.Loop.TriggerWait()
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
before := now.Add(-time.Hour)
|
2020-07-24 10:40:17 +01:00
|
|
|
after := before.Add(2 * time.Hour)
|
|
|
|
|
|
|
|
usage, err := planet.Satellites[0].DB.ProjectAccounting().GetProjectTotal(ctx, satProject.ID, before, after)
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.NotZero(t, usage.Egress)
|
|
|
|
|
|
|
|
partner, err := planet.Satellites[0].API.Marketing.PartnersService.ByName(ctx, "Minio")
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
rows, err := planet.Satellites[0].DB.Attribution().QueryAttribution(ctx, partner.UUID, before, after)
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.NotZero(t, rows[0].RemoteBytesPerHour)
|
|
|
|
require.Equal(t, rows[0].EgressData, usage.Egress)
|
|
|
|
}
|
2020-04-14 12:50:50 +01:00
|
|
|
})
|
|
|
|
}
|
2020-07-20 10:40:12 +01:00
|
|
|
|
|
|
|
func TestAttributionReport(t *testing.T) {
|
|
|
|
testplanet.Run(t, testplanet.Config{
|
|
|
|
SatelliteCount: 1, StorageNodeCount: 4, UplinkCount: 1,
|
|
|
|
Reconfigure: testplanet.Reconfigure{
|
|
|
|
Satellite: testplanet.ReconfigureRS(2, 3, 4, 4),
|
|
|
|
},
|
|
|
|
}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {
|
|
|
|
const (
|
|
|
|
bucketName = "test"
|
|
|
|
filePath = "path"
|
|
|
|
)
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
now := time.Now()
|
|
|
|
tomorrow := now.Add(24 * time.Hour)
|
2020-07-20 10:40:12 +01:00
|
|
|
|
|
|
|
up := planet.Uplinks[0]
|
|
|
|
up.Config.UserAgent = "Zenko/1.0"
|
|
|
|
|
|
|
|
err := up.CreateBucket(ctx, planet.Satellites[0], bucketName)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-21 12:43:11 +01:00
|
|
|
{ // upload and download as Zenko
|
2020-07-20 10:40:12 +01:00
|
|
|
err = up.Upload(ctx, planet.Satellites[0], bucketName, filePath, testrand.Bytes(5*memory.KiB))
|
|
|
|
require.NoError(t, err)
|
2020-07-21 12:43:11 +01:00
|
|
|
|
|
|
|
_, err = up.Download(ctx, planet.Satellites[0], bucketName, filePath)
|
|
|
|
require.NoError(t, err)
|
2020-07-20 10:40:12 +01:00
|
|
|
}
|
|
|
|
|
2020-07-21 12:43:11 +01:00
|
|
|
up.Config.UserAgent = "Minio/1.0"
|
|
|
|
{ // upload and download as Minio
|
|
|
|
err = up.Upload(ctx, planet.Satellites[0], bucketName, filePath, testrand.Bytes(5*memory.KiB))
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
2020-07-20 10:40:12 +01:00
|
|
|
_, err = up.Download(ctx, planet.Satellites[0], bucketName, filePath)
|
|
|
|
require.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
{ // Flush all the pending information through the system.
|
|
|
|
// Calculate the usage used for upload
|
|
|
|
for _, sn := range planet.StorageNodes {
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
sn.Storage2.Orders.SendOrders(ctx, tomorrow)
|
2020-07-20 10:40:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
rollout := planet.Satellites[0].Core.Accounting.ReportedRollupChore
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
require.NoError(t, rollout.RunOnce(ctx, now))
|
2020-07-20 10:40:12 +01:00
|
|
|
|
|
|
|
// Trigger tally so it gets all set up and can return a storage usage
|
|
|
|
planet.Satellites[0].Accounting.Tally.Loop.TriggerWait()
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
storagenode: live tracking of order window usage
This change accomplishes multiple things:
1. Instead of having a max in flight time, which means
we effectively have a minimum bandwidth for uploads
and downloads, we keep track of what windows have
active requests happening in them.
2. We don't double check when we save the order to see if it
is too old: by then, it's too late. A malicious uplink
could just submit orders outside of the grace window and
receive all the data, but the node would just not commit
it, so the uplink gets free traffic. Because the endpoints
also check for the order being too old, this would be a
very tight race that depends on knowledge of the node system
clock, but best to not have the race exist. Instead, we piggy
back off of the in flight tracking and do the check when
we start to handle the order, and commit at the end.
3. Change the functions that send orders and list unsent
orders to accept a time at which that operation is
happening. This way, in tests, we can pretend we're
listing or sending far into the future after the windows
are available to send, rather than exposing test functions
to modify internal state about the grace period to get
the desired effect. This brings tests closer to actual
usage in production.
4. Change the calculation for if an order is allowed to be
enqueued due to the grace period to just look at the
order creation time, rather than some computation involving
the window it will be in. In this way, you can easily
answer the question of "will this order be accepted?" by
asking "is it older than X?" where X is the grace period.
5. Increases the frequency we check to send up orders to once
every 5 minutes instead of once every hour because we already
have hour-long buffering due to the windows. This decreases
the maximum latency that an order will be reported back to
the satellite by 55 minutes.
Change-Id: Ie08b90d139d45ee89b82347e191a2f8db1b88036
2020-08-12 20:01:43 +01:00
|
|
|
before := now.Add(-time.Hour)
|
2020-07-20 10:40:12 +01:00
|
|
|
after := before.Add(2 * time.Hour)
|
|
|
|
|
|
|
|
projectID := up.Projects[0].ID
|
|
|
|
|
|
|
|
usage, err := planet.Satellites[0].DB.ProjectAccounting().GetProjectTotal(ctx, projectID, before, after)
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.NotZero(t, usage.Egress)
|
|
|
|
|
|
|
|
partner, err := planet.Satellites[0].API.Marketing.PartnersService.ByUserAgent(ctx, "Zenko")
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
rows, err := planet.Satellites[0].DB.Attribution().QueryAttribution(ctx, partner.UUID, before, after)
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.NotZero(t, rows[0].RemoteBytesPerHour)
|
|
|
|
require.Equal(t, rows[0].EgressData, usage.Egress)
|
|
|
|
|
2020-07-21 12:43:11 +01:00
|
|
|
// Minio should have no attribution because bucket was created by Zenko
|
|
|
|
partner, err = planet.Satellites[0].API.Marketing.PartnersService.ByUserAgent(ctx, "Minio")
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
rows, err = planet.Satellites[0].DB.Attribution().QueryAttribution(ctx, partner.UUID, before, after)
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.Empty(t, rows)
|
|
|
|
}
|
2020-07-20 10:40:12 +01:00
|
|
|
})
|
|
|
|
}
|