Merge branch 'master' of https://github.com/SiaFoundation/renterd int…

…o pj/state-route

cmd/renterd/main.go

@@ -292,7 +292,6 @@ func main() {
 
 	auth := jape.BasicAuth(getAPIPassword())
 	mux := treeMux{
-		h:   renterd.Handler(),
 		sub: make(map[string]treeMux),
 	}
 
@@ -320,6 +319,9 @@ func main() {
 		mux.sub["/api/bus"] = treeMux{h: auth(b)}
 		busAddr = *apiAddr + "/api/bus"
 		busPassword = getAPIPassword()
+
+		// only serve the UI if a bus is created
+		mux.h = renterd.Handler()
 	} else {
 		fmt.Println("connecting to remote bus at", busAddr)
 	}

cmd/renterd/web.go

@@ -24,5 +24,9 @@ func (t treeMux) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			return
 		}
 	}
-	t.h.ServeHTTP(w, req)
+	if t.h != nil {
+		t.h.ServeHTTP(w, req)
+		return
+	}
+	http.NotFound(w, req)
 }

internal/testing/cluster_test.go

@@ -1827,6 +1827,30 @@ func TestUploadPacking(t *testing.T) {
 			t.Fatal(err)
 		}
 		download(name, data, 0, uint64(len(data)))
+		obj, _, err := b.Object(context.Background(), name)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if obj.Size != int64(len(data)) {
+			t.Fatal("unexpected size after upload", obj.Size, len(data))
+		}
+		entries, err := w.ObjectEntries(context.Background(), "/", "", 0, -1)
+		if err != nil {
+			t.Fatal(err)
+		}
+		var found bool
+		for _, entry := range entries {
+			if entry.Name == "/"+name {
+				if entry.Size != int64(len(data)) {
+					t.Fatal("unexpected size after upload", entry.Size, len(data))
+				}
+				found = true
+				break
+			}
+		}
+		if !found {
+			t.Fatal("object not found in list", name, entries)
+		}
 	}
 
 	// upload file 1 and download it.

object/object.go

@@ -74,7 +74,7 @@ func GenerateEncryptionKey() EncryptionKey {
 type Object struct {
 	Key         EncryptionKey `json:"key"`
 	Slabs       []SlabSlice   `json:"slabs"`
-	PartialSlab *PartialSlab  `json:"partial_slab,omitempty"`
+	PartialSlab *PartialSlab  `json:"partialSlab,omitempty"`
 }
 
 // NewObject returns a new Object with a random key.

stores/metadata.go

@@ -413,26 +413,20 @@ func (s *SQLStore) ObjectsStats(ctx context.Context) (api.ObjectsStatsResponse,
 	var resp api.ObjectsStatsResponse
 	return resp, s.db.Transaction(func(tx *gorm.DB) error {
 		// Number of objects.
+		var objInfo struct {
+			NumObjects       uint64
+			TotalObjectsSize uint64
+		}
 		err := tx.
 			Model(&dbObject{}).
-			Select("COUNT(*)").
-			Scan(&resp.NumObjects).
+			Select("COUNT(*) AS NumObjects, SUM(size) AS TotalObjectsSize").
+			Scan(&objInfo).
 			Error
 		if err != nil {
 			return err
 		}
-
-		// Size of objects.
-		if resp.NumObjects > 0 {
-			err = tx.
-				Model(&dbSlice{}).
-				Select("COALESCE(SUM(length), 0)").
-				Scan(&resp.TotalObjectsSize).
-				Error
-			if err != nil {
-				return err
-			}
-		}
+		resp.NumObjects = objInfo.NumObjects
+		resp.TotalObjectsSize = objInfo.TotalObjectsSize
 
 		// Size of sectors
 		var sectorSizes struct {
@@ -1358,7 +1352,7 @@ GROUP BY slabs.id
 `)
 	return s.retryTransaction(func(tx *gorm.DB) error {
 		if isSQLite(s.db) {
-			return s.db.Exec("UPDATE slabs SET health = (SELECT health FROM (?) WHERE slabs.id = id)", healthQuery).Error
+			return s.db.Exec("UPDATE slabs SET health = COALESCE((SELECT health FROM (?) WHERE slabs.id = id), 1)", healthQuery).Error
 		} else {
 			return s.db.Exec("UPDATE slabs sla INNER JOIN (?) h ON sla.id = h.id SET sla.health = h.health", healthQuery).Error
 		}

stores/migrations.go

@@ -176,6 +176,13 @@ func performMigrations(db *gorm.DB, logger glogger.Interface) error {
 			},
 			Rollback: nil,
 		},
+		{
+			ID: "00007_contractspending",
+			Migrate: func(tx *gorm.DB) error {
+				return performMigration00007_archivedcontractspending(tx, logger)
+			},
+			Rollback: nil,
+		},
 	}
 
 	// Create migrator.
@@ -453,3 +460,19 @@ func performMigration00006_contractspending(txn *gorm.DB, logger glogger.Interfa
 	logger.Info(context.Background(), "migration 00006_contractspending complete")
 	return nil
 }
+
+func performMigration00007_archivedcontractspending(txn *gorm.DB, logger glogger.Interface) error {
+	logger.Info(context.Background(), "performing migration 00007_archivedcontractspending")
+	if !txn.Migrator().HasColumn(&dbArchivedContract{}, "delete_spending") {
+		if err := txn.Migrator().AddColumn(&dbArchivedContract{}, "delete_spending"); err != nil {
+			return err
+		}
+	}
+	if !txn.Migrator().HasColumn(&dbArchivedContract{}, "list_spending") {
+		if err := txn.Migrator().AddColumn(&dbArchivedContract{}, "list_spending"); err != nil {
+			return err
+		}
+	}
+	logger.Info(context.Background(), "migration 00007_archivedcontractspending complete")
+	return nil
+}