91698207cf
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
317 lines
9.4 KiB
Go
317 lines
9.4 KiB
Go
// Copyright (C) 2020 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package orders_test
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"storj.io/common/pb"
|
|
"storj.io/common/storj"
|
|
"storj.io/common/testcontext"
|
|
"storj.io/common/testrand"
|
|
"storj.io/storj/storagenode/orders"
|
|
)
|
|
|
|
func TestOrdersStore_Enqueue_GracePeriodFailure(t *testing.T) {
|
|
ctx := testcontext.New(t)
|
|
defer ctx.Cleanup()
|
|
dirName := ctx.Dir("test-orders")
|
|
now := time.Now()
|
|
|
|
// make order limit grace period 24 hours
|
|
ordersStore, err := orders.NewFileStore(dirName, 24*time.Hour)
|
|
require.NoError(t, err)
|
|
|
|
// adding order before grace period should result in an error
|
|
newSN := testrand.SerialNumber()
|
|
newInfo := &orders.Info{
|
|
Limit: &pb.OrderLimit{
|
|
SerialNumber: newSN,
|
|
SatelliteId: testrand.NodeID(),
|
|
Action: pb.PieceAction_GET,
|
|
OrderCreation: now.Add(-48 * time.Hour),
|
|
OrderExpiration: now.Add(time.Hour),
|
|
},
|
|
Order: &pb.Order{
|
|
SerialNumber: newSN,
|
|
Amount: 10,
|
|
},
|
|
}
|
|
err = ordersStore.Enqueue(newInfo)
|
|
require.Error(t, err)
|
|
}
|
|
|
|
func TestOrdersStore_ListUnsentBySatellite(t *testing.T) {
|
|
ctx := testcontext.New(t)
|
|
defer ctx.Cleanup()
|
|
dirName := ctx.Dir("test-orders")
|
|
now := time.Now()
|
|
|
|
// make order limit grace period 12 hours
|
|
ordersStore, err := orders.NewFileStore(dirName, 12*time.Hour)
|
|
require.NoError(t, err)
|
|
|
|
// for each satellite, make three orders from four hours ago, three from two hours ago, and three from now.
|
|
numSatellites := 3
|
|
createdTimes := []time.Time{
|
|
now.Add(-4 * time.Hour),
|
|
now.Add(-2 * time.Hour),
|
|
now,
|
|
}
|
|
serialsPerSatPerTime := 3
|
|
|
|
originalInfos, err := storeNewOrders(ordersStore, numSatellites, serialsPerSatPerTime, createdTimes)
|
|
require.NoError(t, err)
|
|
|
|
// 3 times:
|
|
// list unsent orders - should receive data from all satellites the first two times, and nothing the last time.
|
|
// archive unsent orders
|
|
expectedArchivedInfos := make(map[storj.SerialNumber]*orders.ArchivedInfo)
|
|
|
|
archiveTime1 := now.Add(-2 * time.Hour)
|
|
archiveTime2 := now
|
|
status1 := pb.SettlementWithWindowResponse_ACCEPTED
|
|
status2 := pb.SettlementWithWindowResponse_REJECTED
|
|
for i := 0; i < 3; i++ {
|
|
// This should return all the orders created more than 1 hour before "now".
|
|
unsentMap, err := ordersStore.ListUnsentBySatellite(now.Add(12 * time.Hour))
|
|
require.NoError(t, err)
|
|
|
|
// on last iteration, expect nothing returned
|
|
if i == 2 {
|
|
require.Len(t, unsentMap, 0)
|
|
break
|
|
}
|
|
|
|
// go through order limits and make sure information is accurate
|
|
require.Len(t, unsentMap, numSatellites)
|
|
for satelliteID, unsentSatList := range unsentMap {
|
|
require.Len(t, unsentSatList.InfoList, serialsPerSatPerTime)
|
|
|
|
for _, unsentInfo := range unsentSatList.InfoList {
|
|
// "new" orders should not be returned
|
|
require.True(t, unsentInfo.Limit.OrderCreation.Before(createdTimes[2]))
|
|
sn := unsentInfo.Limit.SerialNumber
|
|
originalInfo := originalInfos[sn]
|
|
|
|
verifyInfosEqual(t, unsentInfo, originalInfo)
|
|
// expect that creation hour is consistent with order
|
|
require.True(t, unsentSatList.CreatedAtHour.Equal(unsentInfo.Limit.OrderCreation.Truncate(time.Hour)))
|
|
|
|
// add to archive batch
|
|
// create
|
|
archivedAt := archiveTime1
|
|
orderStatus := orders.StatusAccepted
|
|
if i == 1 {
|
|
archivedAt = archiveTime2
|
|
orderStatus = orders.StatusRejected
|
|
}
|
|
newArchivedInfo := &orders.ArchivedInfo{
|
|
Limit: unsentInfo.Limit,
|
|
Order: unsentInfo.Order,
|
|
Status: orderStatus,
|
|
ArchivedAt: archivedAt,
|
|
}
|
|
expectedArchivedInfos[unsentInfo.Limit.SerialNumber] = newArchivedInfo
|
|
}
|
|
|
|
// archive unsent file
|
|
archivedAt := archiveTime1
|
|
status := status1
|
|
if i == 1 {
|
|
archivedAt = archiveTime2
|
|
status = status2
|
|
}
|
|
err = ordersStore.Archive(satelliteID, unsentSatList.CreatedAtHour, archivedAt, status)
|
|
require.NoError(t, err)
|
|
}
|
|
}
|
|
|
|
// list archived, expect everything from first two created at time buckets
|
|
archived, err := ordersStore.ListArchived()
|
|
require.NoError(t, err)
|
|
require.Len(t, archived, numSatellites*serialsPerSatPerTime*2)
|
|
for _, archivedInfo := range archived {
|
|
sn := archivedInfo.Limit.SerialNumber
|
|
expectedInfo := expectedArchivedInfos[sn]
|
|
verifyArchivedInfosEqual(t, expectedInfo, archivedInfo)
|
|
|
|
// one of the batches should be "accepted" and the other should be "rejected"
|
|
if archivedInfo.ArchivedAt.Round(0).Equal(archiveTime2.Round(0)) {
|
|
require.Equal(t, archivedInfo.Status, orders.StatusRejected)
|
|
} else {
|
|
require.Equal(t, archivedInfo.Status, orders.StatusAccepted)
|
|
}
|
|
}
|
|
|
|
// clean archive for anything older than 30 minutes
|
|
err = ordersStore.CleanArchive(now.Add(-30 * time.Minute))
|
|
require.NoError(t, err)
|
|
|
|
// list archived, expect only recent archived batch (other was cleaned)
|
|
archived, err = ordersStore.ListArchived()
|
|
require.NoError(t, err)
|
|
require.Len(t, archived, numSatellites*serialsPerSatPerTime)
|
|
for _, archivedInfo := range archived {
|
|
sn := archivedInfo.Limit.SerialNumber
|
|
expectedInfo := expectedArchivedInfos[sn]
|
|
verifyArchivedInfosEqual(t, expectedInfo, archivedInfo)
|
|
require.Equal(t, archivedInfo.ArchivedAt.Round(0), archiveTime2.Round(0))
|
|
require.Equal(t, archivedInfo.Status, orders.StatusRejected)
|
|
}
|
|
|
|
// clean archive for everything before now, expect list to return nothing
|
|
err = ordersStore.CleanArchive(now.Add(time.Nanosecond))
|
|
require.NoError(t, err)
|
|
archived, err = ordersStore.ListArchived()
|
|
require.NoError(t, err)
|
|
require.Len(t, archived, 0)
|
|
}
|
|
|
|
func TestOrdersStore_ListUnsentBySatellite_Ongoing(t *testing.T) {
|
|
ctx := testcontext.New(t)
|
|
defer ctx.Cleanup()
|
|
dirName := ctx.Dir("test-orders")
|
|
now := time.Now()
|
|
satellite := testrand.NodeID()
|
|
tomorrow := now.Add(24 * time.Hour)
|
|
|
|
// make order limit grace period 1 hour
|
|
ordersStore, err := orders.NewFileStore(dirName, time.Hour)
|
|
require.NoError(t, err)
|
|
|
|
// empty store means no orders can be listed
|
|
unsent, err := ordersStore.ListUnsentBySatellite(tomorrow)
|
|
require.NoError(t, err)
|
|
require.Len(t, unsent, 0)
|
|
|
|
// store an order that can be listed
|
|
sn := testrand.SerialNumber()
|
|
require.NoError(t, ordersStore.Enqueue(&orders.Info{
|
|
Limit: &pb.OrderLimit{
|
|
SerialNumber: sn,
|
|
SatelliteId: satellite,
|
|
Action: pb.PieceAction_GET,
|
|
OrderCreation: now,
|
|
},
|
|
Order: &pb.Order{
|
|
SerialNumber: sn,
|
|
Amount: 1,
|
|
},
|
|
}))
|
|
|
|
// check that we can list it tomorrow
|
|
unsent, err = ordersStore.ListUnsentBySatellite(tomorrow)
|
|
require.NoError(t, err)
|
|
require.Len(t, unsent, 1)
|
|
|
|
// begin an enqueue in the bucket
|
|
commit, err := ordersStore.BeginEnqueue(satellite, now)
|
|
require.NoError(t, err)
|
|
|
|
// we should no longer be able to list that window
|
|
unsent, err = ordersStore.ListUnsentBySatellite(tomorrow)
|
|
require.NoError(t, err)
|
|
require.Len(t, unsent, 0)
|
|
|
|
// commit the order
|
|
sn = testrand.SerialNumber()
|
|
require.NoError(t, commit(&orders.Info{
|
|
Limit: &pb.OrderLimit{
|
|
SerialNumber: sn,
|
|
SatelliteId: satellite,
|
|
Action: pb.PieceAction_GET,
|
|
OrderCreation: now,
|
|
},
|
|
Order: &pb.Order{
|
|
SerialNumber: sn,
|
|
Amount: 1,
|
|
},
|
|
}))
|
|
|
|
// check that we can list it tomorrow
|
|
unsent, err = ordersStore.ListUnsentBySatellite(tomorrow)
|
|
require.NoError(t, err)
|
|
require.Len(t, unsent, 1)
|
|
}
|
|
|
|
func verifyInfosEqual(t *testing.T, a, b *orders.Info) {
|
|
t.Helper()
|
|
|
|
require.NotNil(t, a)
|
|
require.NotNil(t, b)
|
|
|
|
require.Equal(t, a.Limit.SerialNumber, b.Limit.SerialNumber)
|
|
require.Equal(t, a.Limit.SatelliteId, b.Limit.SatelliteId)
|
|
require.Equal(t, a.Limit.OrderExpiration.UTC(), b.Limit.OrderExpiration.UTC())
|
|
require.Equal(t, a.Limit.Action, b.Limit.Action)
|
|
|
|
require.Equal(t, a.Order.Amount, b.Order.Amount)
|
|
require.Equal(t, a.Order.SerialNumber, b.Order.SerialNumber)
|
|
}
|
|
|
|
func verifyArchivedInfosEqual(t *testing.T, a, b *orders.ArchivedInfo) {
|
|
t.Helper()
|
|
|
|
require.NotNil(t, a)
|
|
require.NotNil(t, b)
|
|
|
|
require.Equal(t, a.Limit.SerialNumber, b.Limit.SerialNumber)
|
|
require.Equal(t, a.Limit.SatelliteId, b.Limit.SatelliteId)
|
|
require.Equal(t, a.Limit.OrderExpiration.UTC(), b.Limit.OrderExpiration.UTC())
|
|
require.Equal(t, a.Limit.Action, b.Limit.Action)
|
|
|
|
require.Equal(t, a.Order.Amount, b.Order.Amount)
|
|
require.Equal(t, a.Order.SerialNumber, b.Order.SerialNumber)
|
|
|
|
require.Equal(t, a.Status, b.Status)
|
|
require.Equal(t, a.ArchivedAt.UTC(), b.ArchivedAt.UTC())
|
|
}
|
|
|
|
func storeNewOrders(ordersStore *orders.FileStore, numSatellites, numOrdersPerSatPerTime int, createdAtTimes []time.Time) (map[storj.SerialNumber]*orders.Info, error) {
|
|
actions := []pb.PieceAction{
|
|
pb.PieceAction_GET,
|
|
pb.PieceAction_PUT_REPAIR,
|
|
pb.PieceAction_GET_AUDIT,
|
|
}
|
|
originalInfos := make(map[storj.SerialNumber]*orders.Info)
|
|
for i := 0; i < numSatellites; i++ {
|
|
satellite := testrand.NodeID()
|
|
|
|
for _, createdAt := range createdAtTimes {
|
|
for j := 0; j < numOrdersPerSatPerTime; j++ {
|
|
expiration := time.Now().Add(time.Hour)
|
|
amount := testrand.Int63n(1000)
|
|
sn := testrand.SerialNumber()
|
|
action := actions[j%len(actions)]
|
|
|
|
newInfo := &orders.Info{
|
|
Limit: &pb.OrderLimit{
|
|
SerialNumber: sn,
|
|
SatelliteId: satellite,
|
|
Action: action,
|
|
OrderCreation: createdAt,
|
|
OrderExpiration: expiration,
|
|
},
|
|
Order: &pb.Order{
|
|
SerialNumber: sn,
|
|
Amount: amount,
|
|
},
|
|
}
|
|
originalInfos[sn] = newInfo
|
|
|
|
// store the new info in the orders store
|
|
err := ordersStore.Enqueue(newInfo)
|
|
if err != nil {
|
|
return originalInfos, err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return originalInfos, nil
|
|
}
|