2021-04-18 15:41:13 -04:00
|
|
|
// Copyright (c) 2015-2021 MinIO, Inc.
|
|
|
|
//
|
|
|
|
// This file is part of MinIO Object Storage stack
|
|
|
|
//
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// This program is distributed in the hope that it will be useful
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU Affero General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2020-06-22 20:27:54 -04:00
|
|
|
|
2020-06-12 23:04:01 -04:00
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
2020-06-22 16:20:22 -04:00
|
|
|
"bytes"
|
2021-03-29 20:00:55 -04:00
|
|
|
"encoding/binary"
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
"encoding/hex"
|
2020-06-22 16:20:22 -04:00
|
|
|
"encoding/json"
|
2021-03-29 20:00:55 -04:00
|
|
|
"errors"
|
2020-06-22 16:20:22 -04:00
|
|
|
"fmt"
|
2020-06-12 23:04:01 -04:00
|
|
|
"io"
|
2020-06-22 16:20:22 -04:00
|
|
|
"log"
|
2020-06-12 23:04:01 -04:00
|
|
|
"os"
|
2023-06-22 15:41:24 -04:00
|
|
|
"path/filepath"
|
|
|
|
"sort"
|
2021-10-01 14:50:00 -04:00
|
|
|
"strings"
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
"time"
|
2020-06-12 23:04:01 -04:00
|
|
|
|
2023-06-22 15:41:24 -04:00
|
|
|
"github.com/google/uuid"
|
2021-10-01 14:50:00 -04:00
|
|
|
"github.com/klauspost/compress/zip"
|
2022-12-08 13:42:44 -05:00
|
|
|
"github.com/klauspost/filepathx"
|
2023-06-22 15:41:24 -04:00
|
|
|
"github.com/klauspost/reedsolomon"
|
2020-06-12 23:04:01 -04:00
|
|
|
"github.com/minio/cli"
|
|
|
|
"github.com/tinylib/msgp/msgp"
|
|
|
|
)
|
|
|
|
|
|
|
|
func main() {
|
|
|
|
app := cli.NewApp()
|
|
|
|
app.Copyright = "MinIO, Inc."
|
|
|
|
app.Usage = "xl.meta to JSON"
|
2020-06-22 20:27:54 -04:00
|
|
|
app.HideVersion = true
|
|
|
|
app.CustomAppHelpTemplate = `NAME:
|
|
|
|
{{.Name}} - {{.Usage}}
|
|
|
|
|
|
|
|
USAGE:
|
|
|
|
{{.Name}} {{if .VisibleFlags}}[FLAGS]{{end}} METAFILES...
|
2021-05-28 11:10:41 -04:00
|
|
|
|
2021-11-12 19:18:53 -05:00
|
|
|
Multiple files can be added. Files ending in '.zip' will be searched
|
|
|
|
for 'xl.meta' files. Wildcards are accepted: 'testdir/*.txt' will compress
|
|
|
|
all files in testdir ending with '.txt', directories can be wildcards
|
|
|
|
as well. 'testdir/*/*.txt' will match 'testdir/subdir/b.txt', double stars
|
|
|
|
means full recursive. 'testdir/**/xl.meta' will search for all xl.meta
|
|
|
|
recursively.
|
2021-05-28 11:10:41 -04:00
|
|
|
|
2021-11-12 19:18:53 -05:00
|
|
|
FLAGS:
|
2020-06-22 20:27:54 -04:00
|
|
|
{{range .VisibleFlags}}{{.}}
|
2021-11-12 19:18:53 -05:00
|
|
|
{{end}}
|
2020-06-22 20:27:54 -04:00
|
|
|
`
|
|
|
|
|
2020-06-12 23:04:01 -04:00
|
|
|
app.HideHelpCommand = true
|
|
|
|
|
|
|
|
app.Flags = []cli.Flag{
|
2020-06-22 16:20:22 -04:00
|
|
|
cli.BoolFlag{
|
2021-11-12 19:18:53 -05:00
|
|
|
Usage: "print each file as a separate line without formatting",
|
2020-06-22 16:20:22 -04:00
|
|
|
Name: "ndjson",
|
2020-06-12 23:04:01 -04:00
|
|
|
},
|
2021-03-29 20:00:55 -04:00
|
|
|
cli.BoolFlag{
|
2021-11-12 19:18:53 -05:00
|
|
|
Usage: "display inline data keys and sizes",
|
2021-03-29 20:00:55 -04:00
|
|
|
Name: "data",
|
|
|
|
},
|
2021-05-28 11:10:41 -04:00
|
|
|
cli.BoolFlag{
|
2021-11-12 19:18:53 -05:00
|
|
|
Usage: "export inline data",
|
2021-05-28 11:10:41 -04:00
|
|
|
Name: "export",
|
|
|
|
},
|
2023-06-22 15:41:24 -04:00
|
|
|
cli.BoolFlag{
|
|
|
|
Usage: "combine inline data",
|
|
|
|
Name: "combine",
|
|
|
|
},
|
2020-06-12 23:04:01 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
app.Action = func(c *cli.Context) error {
|
2021-10-01 14:50:00 -04:00
|
|
|
ndjson := c.Bool("ndjson")
|
2023-06-22 15:41:24 -04:00
|
|
|
if c.Bool("data") && c.Bool("combine") {
|
|
|
|
return errors.New("cannot combine --data and --combine")
|
|
|
|
}
|
|
|
|
// file / version / file
|
|
|
|
filemap := make(map[string]map[string]string)
|
|
|
|
// versionID ->
|
|
|
|
combineFiles := make(map[string][]string)
|
2021-10-01 14:50:00 -04:00
|
|
|
decode := func(r io.Reader, file string) ([]byte, error) {
|
2022-09-19 14:05:16 -04:00
|
|
|
b, err := io.ReadAll(r)
|
2020-06-22 16:20:22 -04:00
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2020-06-22 16:20:22 -04:00
|
|
|
}
|
2021-03-29 20:00:55 -04:00
|
|
|
b, _, minor, err := checkXL2V1(b)
|
2020-06-22 16:20:22 -04:00
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2020-06-22 16:20:22 -04:00
|
|
|
}
|
2023-06-22 15:41:24 -04:00
|
|
|
filemap[file] = make(map[string]string)
|
2021-03-29 20:00:55 -04:00
|
|
|
buf := bytes.NewBuffer(nil)
|
|
|
|
var data xlMetaInlineData
|
|
|
|
switch minor {
|
|
|
|
case 0:
|
2021-11-12 19:18:53 -05:00
|
|
|
_, err = msgp.CopyToJSON(buf, bytes.NewReader(b))
|
2021-03-29 20:00:55 -04:00
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2021-03-29 20:00:55 -04:00
|
|
|
}
|
2021-04-09 20:38:23 -04:00
|
|
|
case 1, 2:
|
2021-03-29 20:00:55 -04:00
|
|
|
v, b, err := msgp.ReadBytesZC(b)
|
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2021-03-29 20:00:55 -04:00
|
|
|
}
|
2021-04-09 20:38:23 -04:00
|
|
|
if _, nbuf, err := msgp.ReadUint32Bytes(b); err == nil {
|
|
|
|
// Read metadata CRC (added in v2, ignore if not found)
|
|
|
|
b = nbuf
|
|
|
|
}
|
|
|
|
|
2021-11-12 19:18:53 -05:00
|
|
|
_, err = msgp.CopyToJSON(buf, bytes.NewReader(v))
|
2021-03-29 20:00:55 -04:00
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2021-03-29 20:00:55 -04:00
|
|
|
}
|
|
|
|
data = b
|
2021-11-18 15:15:22 -05:00
|
|
|
case 3:
|
|
|
|
v, b, err := msgp.ReadBytesZC(b)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if _, nbuf, err := msgp.ReadUint32Bytes(b); err == nil {
|
|
|
|
// Read metadata CRC (added in v2, ignore if not found)
|
|
|
|
b = nbuf
|
|
|
|
}
|
|
|
|
|
|
|
|
nVers, v, err := decodeXLHeaders(v)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
type version struct {
|
|
|
|
Idx int
|
|
|
|
Header json.RawMessage
|
|
|
|
Metadata json.RawMessage
|
2021-11-18 15:15:22 -05:00
|
|
|
}
|
2022-01-03 04:28:52 -05:00
|
|
|
versions := make([]version, nVers)
|
2021-11-18 15:15:22 -05:00
|
|
|
err = decodeVersions(v, nVers, func(idx int, hdr, meta []byte) error {
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
var header xlMetaV2VersionHeaderV2
|
|
|
|
if _, err := header.UnmarshalMsg(hdr); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
b, err := header.MarshalJSON()
|
|
|
|
if err != nil {
|
2021-11-18 15:15:22 -05:00
|
|
|
return err
|
|
|
|
}
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
var buf bytes.Buffer
|
2021-11-18 15:15:22 -05:00
|
|
|
if _, err := msgp.UnmarshalAsJSON(&buf, meta); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
versions[idx] = version{
|
|
|
|
Idx: idx,
|
|
|
|
Header: b,
|
|
|
|
Metadata: buf.Bytes(),
|
|
|
|
}
|
2023-06-22 15:41:24 -04:00
|
|
|
type erasureInfo struct {
|
|
|
|
V2Obj *struct {
|
|
|
|
EcDist []int
|
|
|
|
EcIndex int
|
|
|
|
EcM int
|
|
|
|
EcN int
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var ei erasureInfo
|
|
|
|
if err := json.Unmarshal(buf.Bytes(), &ei); err == nil && ei.V2Obj != nil {
|
|
|
|
verID := uuid.UUID(header.VersionID).String()
|
|
|
|
idx := ei.V2Obj.EcIndex
|
|
|
|
filemap[file][verID] = fmt.Sprintf("%s/shard-%02d-of-%02d", verID, idx, ei.V2Obj.EcN+ei.V2Obj.EcM)
|
|
|
|
filemap[file][verID+".json"] = buf.String()
|
|
|
|
}
|
2021-11-18 15:15:22 -05:00
|
|
|
return nil
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
enc := json.NewEncoder(buf)
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
if err := enc.Encode(struct {
|
|
|
|
Versions []version
|
|
|
|
}{Versions: versions}); err != nil {
|
2021-11-18 15:15:22 -05:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
data = b
|
2021-03-29 20:00:55 -04:00
|
|
|
default:
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, fmt.Errorf("unknown metadata version %d", minor)
|
2021-03-29 20:00:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if c.Bool("data") {
|
|
|
|
b, err := data.json()
|
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2021-03-29 20:00:55 -04:00
|
|
|
}
|
|
|
|
buf = bytes.NewBuffer(b)
|
2020-06-22 16:20:22 -04:00
|
|
|
}
|
2021-05-28 11:10:41 -04:00
|
|
|
if c.Bool("export") {
|
2023-06-22 15:41:24 -04:00
|
|
|
file := file
|
|
|
|
if !c.Bool("combine") {
|
|
|
|
file = strings.Map(func(r rune) rune {
|
|
|
|
switch {
|
|
|
|
case r >= 'a' && r <= 'z':
|
|
|
|
return r
|
|
|
|
case r >= 'A' && r <= 'Z':
|
|
|
|
return r
|
|
|
|
case r >= '0' && r <= '9':
|
|
|
|
return r
|
|
|
|
case strings.ContainsAny(string(r), "+=-_()!@."):
|
|
|
|
return r
|
|
|
|
default:
|
|
|
|
return '_'
|
|
|
|
}
|
|
|
|
}, file)
|
|
|
|
}
|
2021-05-28 11:10:41 -04:00
|
|
|
err := data.files(func(name string, data []byte) {
|
2023-06-22 15:41:24 -04:00
|
|
|
fn := fmt.Sprintf("%s-%s.data", file, name)
|
|
|
|
if c.Bool("combine") {
|
|
|
|
f := filemap[file][name]
|
|
|
|
if f != "" {
|
|
|
|
fn = f + ".data"
|
|
|
|
os.MkdirAll(filepath.Dir(fn), os.ModePerm)
|
|
|
|
err = os.WriteFile(fn+".json", []byte(filemap[file][name+".json"]), os.ModePerm)
|
|
|
|
combineFiles[name] = append(combineFiles[name], fn)
|
|
|
|
if err != nil {
|
|
|
|
fmt.Println("ERR:", err)
|
|
|
|
}
|
|
|
|
_ = os.WriteFile(filepath.Dir(fn)+"/filename.txt", []byte(file), os.ModePerm)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
err = os.WriteFile(fn, data, os.ModePerm)
|
2021-10-01 14:50:00 -04:00
|
|
|
if err != nil {
|
|
|
|
fmt.Println(err)
|
|
|
|
}
|
2021-05-28 11:10:41 -04:00
|
|
|
})
|
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2021-05-28 11:10:41 -04:00
|
|
|
}
|
|
|
|
}
|
2021-10-01 14:50:00 -04:00
|
|
|
if ndjson {
|
|
|
|
return buf.Bytes(), nil
|
2020-06-22 16:20:22 -04:00
|
|
|
}
|
|
|
|
var msi map[string]interface{}
|
2021-03-29 20:00:55 -04:00
|
|
|
dec := json.NewDecoder(buf)
|
2020-06-22 16:20:22 -04:00
|
|
|
// Use number to preserve integers.
|
|
|
|
dec.UseNumber()
|
|
|
|
err = dec.Decode(&msi)
|
|
|
|
if err != nil {
|
2021-10-01 14:50:00 -04:00
|
|
|
return nil, err
|
2020-06-22 16:20:22 -04:00
|
|
|
}
|
2021-03-29 20:00:55 -04:00
|
|
|
b, err = json.MarshalIndent(msi, "", " ")
|
2021-10-01 14:50:00 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return b, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
args := c.Args()
|
|
|
|
if len(args) == 0 {
|
|
|
|
// If no args, assume xl.meta
|
|
|
|
args = []string{"xl.meta"}
|
|
|
|
}
|
|
|
|
var files []string
|
|
|
|
|
|
|
|
for _, pattern := range args {
|
|
|
|
if pattern == "-" {
|
|
|
|
files = append(files, pattern)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
found, err := filepathx.Glob(pattern)
|
2020-06-22 16:20:22 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2021-10-01 14:50:00 -04:00
|
|
|
if len(found) == 0 {
|
|
|
|
return fmt.Errorf("unable to find file %v", pattern)
|
|
|
|
}
|
|
|
|
files = append(files, found...)
|
|
|
|
}
|
|
|
|
if len(files) == 0 {
|
|
|
|
return fmt.Errorf("no files found")
|
|
|
|
}
|
|
|
|
multiple := len(files) > 1 || strings.HasSuffix(files[0], ".zip")
|
|
|
|
if multiple {
|
|
|
|
ndjson = true
|
|
|
|
fmt.Println("{")
|
|
|
|
}
|
|
|
|
|
|
|
|
hasWritten := false
|
|
|
|
for _, file := range files {
|
|
|
|
var r io.Reader
|
|
|
|
var sz int64
|
|
|
|
switch file {
|
|
|
|
case "-":
|
|
|
|
r = os.Stdin
|
|
|
|
default:
|
|
|
|
f, err := os.Open(file)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if st, err := f.Stat(); err == nil {
|
|
|
|
sz = st.Size()
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
r = f
|
|
|
|
}
|
|
|
|
if strings.HasSuffix(file, ".zip") {
|
|
|
|
zr, err := zip.NewReader(r.(io.ReaderAt), sz)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, file := range zr.File {
|
|
|
|
if !file.FileInfo().IsDir() && strings.HasSuffix(file.Name, "xl.meta") {
|
|
|
|
r, err := file.Open()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
// Quote string...
|
|
|
|
b, _ := json.Marshal(file.Name)
|
|
|
|
if hasWritten {
|
|
|
|
fmt.Print(",\n")
|
|
|
|
}
|
|
|
|
fmt.Printf("\t%s: ", string(b))
|
|
|
|
|
|
|
|
b, err = decode(r, file.Name)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
fmt.Print(string(b))
|
|
|
|
hasWritten = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if multiple {
|
|
|
|
// Quote string...
|
|
|
|
b, _ := json.Marshal(file)
|
|
|
|
if hasWritten {
|
|
|
|
fmt.Print(",\n")
|
|
|
|
}
|
|
|
|
fmt.Printf("\t%s: ", string(b))
|
|
|
|
}
|
|
|
|
|
|
|
|
b, err := decode(r, file)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
hasWritten = true
|
|
|
|
fmt.Print(string(b))
|
|
|
|
}
|
2020-06-12 23:04:01 -04:00
|
|
|
}
|
2021-10-01 14:50:00 -04:00
|
|
|
fmt.Println("")
|
|
|
|
if multiple {
|
|
|
|
fmt.Println("}")
|
|
|
|
}
|
2023-06-22 15:41:24 -04:00
|
|
|
if len(combineFiles) > 0 {
|
|
|
|
for k, v := range combineFiles {
|
|
|
|
if err := combine(v, k); err != nil {
|
|
|
|
fmt.Println("ERROR:", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-10-01 14:50:00 -04:00
|
|
|
|
2020-06-22 16:20:22 -04:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
err := app.Run(os.Args)
|
|
|
|
if err != nil {
|
|
|
|
log.Fatal(err)
|
2020-06-12 23:04:01 -04:00
|
|
|
}
|
|
|
|
}
|
2021-03-29 20:00:55 -04:00
|
|
|
|
|
|
|
var (
|
|
|
|
// XL header specifies the format
|
|
|
|
xlHeader = [4]byte{'X', 'L', '2', ' '}
|
|
|
|
|
|
|
|
// Current version being written.
|
|
|
|
xlVersionCurrent [4]byte
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
// Breaking changes.
|
|
|
|
// Newer versions cannot be read by older software.
|
|
|
|
// This will prevent downgrades to incompatible versions.
|
|
|
|
xlVersionMajor = 1
|
|
|
|
|
|
|
|
// Non breaking changes.
|
|
|
|
// Bumping this is informational, but should be done
|
|
|
|
// if any change is made to the data stored, bumping this
|
|
|
|
// will allow to detect the exact version later.
|
|
|
|
xlVersionMinor = 1
|
|
|
|
)
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
binary.LittleEndian.PutUint16(xlVersionCurrent[0:2], xlVersionMajor)
|
|
|
|
binary.LittleEndian.PutUint16(xlVersionCurrent[2:4], xlVersionMinor)
|
|
|
|
}
|
|
|
|
|
|
|
|
// checkXL2V1 will check if the metadata has correct header and is a known major version.
|
|
|
|
// The remaining payload and versions are returned.
|
|
|
|
func checkXL2V1(buf []byte) (payload []byte, major, minor uint16, err error) {
|
|
|
|
if len(buf) <= 8 {
|
|
|
|
return payload, 0, 0, fmt.Errorf("xlMeta: no data")
|
|
|
|
}
|
|
|
|
|
|
|
|
if !bytes.Equal(buf[:4], xlHeader[:]) {
|
|
|
|
return payload, 0, 0, fmt.Errorf("xlMeta: unknown XLv2 header, expected %v, got %v", xlHeader[:4], buf[:4])
|
|
|
|
}
|
|
|
|
|
|
|
|
if bytes.Equal(buf[4:8], []byte("1 ")) {
|
|
|
|
// Set as 1,0.
|
|
|
|
major, minor = 1, 0
|
|
|
|
} else {
|
|
|
|
major, minor = binary.LittleEndian.Uint16(buf[4:6]), binary.LittleEndian.Uint16(buf[6:8])
|
|
|
|
}
|
|
|
|
if major > xlVersionMajor {
|
|
|
|
return buf[8:], major, minor, fmt.Errorf("xlMeta: unknown major version %d found", major)
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf[8:], major, minor, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
const xlMetaInlineDataVer = 1
|
|
|
|
|
|
|
|
type xlMetaInlineData []byte
|
|
|
|
|
|
|
|
// afterVersion returns the payload after the version, if any.
|
|
|
|
func (x xlMetaInlineData) afterVersion() []byte {
|
|
|
|
if len(x) == 0 {
|
|
|
|
return x
|
|
|
|
}
|
|
|
|
return x[1:]
|
|
|
|
}
|
|
|
|
|
|
|
|
// versionOK returns whether the version is ok.
|
|
|
|
func (x xlMetaInlineData) versionOK() bool {
|
|
|
|
if len(x) == 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return x[0] > 0 && x[0] <= xlMetaInlineDataVer
|
|
|
|
}
|
|
|
|
|
|
|
|
func (x xlMetaInlineData) json() ([]byte, error) {
|
|
|
|
if len(x) == 0 {
|
|
|
|
return []byte("{}"), nil
|
|
|
|
}
|
|
|
|
if !x.versionOK() {
|
|
|
|
return nil, errors.New("xlMetaInlineData: unknown version")
|
|
|
|
}
|
|
|
|
|
|
|
|
sz, buf, err := msgp.ReadMapHeaderBytes(x.afterVersion())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
res := []byte("{")
|
|
|
|
|
|
|
|
for i := uint32(0); i < sz; i++ {
|
|
|
|
var key, val []byte
|
|
|
|
key, buf, err = msgp.ReadMapKeyZC(buf)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if len(key) == 0 {
|
|
|
|
return nil, fmt.Errorf("xlMetaInlineData: key %d is length 0", i)
|
|
|
|
}
|
|
|
|
// Skip data...
|
|
|
|
val, buf, err = msgp.ReadBytesZC(buf)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if i > 0 {
|
|
|
|
res = append(res, ',')
|
|
|
|
}
|
|
|
|
s := fmt.Sprintf(`"%s":%d`, string(key), len(val))
|
|
|
|
res = append(res, []byte(s)...)
|
|
|
|
}
|
|
|
|
res = append(res, '}')
|
|
|
|
return res, nil
|
|
|
|
}
|
2021-05-28 11:10:41 -04:00
|
|
|
|
|
|
|
// files returns files as callback.
|
|
|
|
func (x xlMetaInlineData) files(fn func(name string, data []byte)) error {
|
|
|
|
if len(x) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if !x.versionOK() {
|
|
|
|
return errors.New("xlMetaInlineData: unknown version")
|
|
|
|
}
|
|
|
|
|
|
|
|
sz, buf, err := msgp.ReadMapHeaderBytes(x.afterVersion())
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := uint32(0); i < sz; i++ {
|
|
|
|
var key, val []byte
|
|
|
|
key, buf, err = msgp.ReadMapKeyZC(buf)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if len(key) == 0 {
|
|
|
|
return fmt.Errorf("xlMetaInlineData: key %d is length 0", i)
|
|
|
|
}
|
|
|
|
// Read data...
|
|
|
|
val, buf, err = msgp.ReadBytesZC(buf)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
// Call back.
|
|
|
|
fn(string(key), val)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
2021-11-18 15:15:22 -05:00
|
|
|
|
|
|
|
const (
|
|
|
|
xlHeaderVersion = 2
|
2022-10-28 05:48:43 -04:00
|
|
|
xlMetaVersion = 2
|
2021-11-18 15:15:22 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
func decodeXLHeaders(buf []byte) (versions int, b []byte, err error) {
|
|
|
|
hdrVer, buf, err := msgp.ReadUintBytes(buf)
|
|
|
|
if err != nil {
|
|
|
|
return 0, buf, err
|
|
|
|
}
|
|
|
|
metaVer, buf, err := msgp.ReadUintBytes(buf)
|
|
|
|
if err != nil {
|
|
|
|
return 0, buf, err
|
|
|
|
}
|
|
|
|
if hdrVer > xlHeaderVersion {
|
|
|
|
return 0, buf, fmt.Errorf("decodeXLHeaders: Unknown xl header version %d", metaVer)
|
|
|
|
}
|
|
|
|
if metaVer > xlMetaVersion {
|
|
|
|
return 0, buf, fmt.Errorf("decodeXLHeaders: Unknown xl meta version %d", metaVer)
|
|
|
|
}
|
|
|
|
versions, buf, err = msgp.ReadIntBytes(buf)
|
|
|
|
if err != nil {
|
|
|
|
return 0, buf, err
|
|
|
|
}
|
|
|
|
if versions < 0 {
|
|
|
|
return 0, buf, fmt.Errorf("decodeXLHeaders: Negative version count %d", versions)
|
|
|
|
}
|
|
|
|
return versions, buf, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// decodeVersions will decode a number of versions from a buffer
|
|
|
|
// and perform a callback for each version in order, newest first.
|
|
|
|
// Any non-nil error is returned.
|
|
|
|
func decodeVersions(buf []byte, versions int, fn func(idx int, hdr, meta []byte) error) (err error) {
|
|
|
|
var tHdr, tMeta []byte // Zero copy bytes
|
|
|
|
for i := 0; i < versions; i++ {
|
|
|
|
tHdr, buf, err = msgp.ReadBytesZC(buf)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
tMeta, buf, err = msgp.ReadBytesZC(buf)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err = fn(i, tHdr, tMeta); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
xl-meta: Add header titles (#13880)
Add type for headers and create custom marshal to make
it easier to read. Group headers and metadata.
Restore functionality that will read `xl.meta` in the current dir with no params.
Before:
```
{
"Headers": [
[
"8M04bTiYRDmEMQGeAsk1yg==",
1639150471630100400,
"rLD1Rw==",
1,
6
],
],
"Versions": [
{
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
]
}
```
After:
```
{
"Versions": [
{
"Header": {
"Flags": 6,
"ModTime": "2021-12-10T16:34:31.6301004+01:00",
"Signature": "acb0f547",
"Type": 1,
"VersionID": "f0cd386d389844398431019e02c935ca"
},
"Idx": 0,
"Metadata": {
"Type": 1,
"V2Obj": {
"CSumAlgo": 1,
"DDir": "oC1Xpg4tRfW03g8o8w7Bzg==",
"EcAlgo": 1,
"EcBSize": 1048576,
"EcDist": [
7,
8,
1,
2,
3,
4,
5,
6
],
"EcIndex": 1,
"EcM": 4,
"EcN": 4,
"ID": "8M04bTiYRDmEMQGeAsk1yg==",
"MTime": 1639150471630100400,
"MetaSys": {
"x-minio-internal-inline-data": "dHJ1ZQ=="
},
"MetaUsr": {
"content-type": "application/octet-stream",
"etag": "b8252c86fad2d8937300aa92b467a3aa"
},
"PartASizes": [
1000
],
"PartETags": null,
"PartNums": [
1
],
"PartSizes": [
1000
],
"Size": 1000
}
}
}
]
}
```
2021-12-10 18:03:25 -05:00
|
|
|
|
|
|
|
type xlMetaV2VersionHeaderV2 struct {
|
|
|
|
VersionID [16]byte
|
|
|
|
ModTime int64
|
|
|
|
Signature [4]byte
|
|
|
|
Type uint8
|
|
|
|
Flags uint8
|
|
|
|
}
|
|
|
|
|
|
|
|
// UnmarshalMsg implements msgp.Unmarshaler
|
|
|
|
func (z *xlMetaV2VersionHeaderV2) UnmarshalMsg(bts []byte) (o []byte, err error) {
|
|
|
|
var zb0001 uint32
|
|
|
|
zb0001, bts, err = msgp.ReadArrayHeaderBytes(bts)
|
|
|
|
if err != nil {
|
|
|
|
err = msgp.WrapError(err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if zb0001 != 5 {
|
|
|
|
err = msgp.ArrayError{Wanted: 5, Got: zb0001}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
bts, err = msgp.ReadExactBytes(bts, (z.VersionID)[:])
|
|
|
|
if err != nil {
|
|
|
|
err = msgp.WrapError(err, "VersionID")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
z.ModTime, bts, err = msgp.ReadInt64Bytes(bts)
|
|
|
|
if err != nil {
|
|
|
|
err = msgp.WrapError(err, "ModTime")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
bts, err = msgp.ReadExactBytes(bts, (z.Signature)[:])
|
|
|
|
if err != nil {
|
|
|
|
err = msgp.WrapError(err, "Signature")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
{
|
|
|
|
var zb0002 uint8
|
|
|
|
zb0002, bts, err = msgp.ReadUint8Bytes(bts)
|
|
|
|
if err != nil {
|
|
|
|
err = msgp.WrapError(err, "Type")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
z.Type = zb0002
|
|
|
|
}
|
|
|
|
{
|
|
|
|
var zb0003 uint8
|
|
|
|
zb0003, bts, err = msgp.ReadUint8Bytes(bts)
|
|
|
|
if err != nil {
|
|
|
|
err = msgp.WrapError(err, "Flags")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
z.Flags = zb0003
|
|
|
|
}
|
|
|
|
o = bts
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
func (z xlMetaV2VersionHeaderV2) MarshalJSON() (o []byte, err error) {
|
|
|
|
tmp := struct {
|
|
|
|
VersionID string
|
|
|
|
ModTime time.Time
|
|
|
|
Signature string
|
|
|
|
Type uint8
|
|
|
|
Flags uint8
|
|
|
|
}{
|
|
|
|
VersionID: hex.EncodeToString(z.VersionID[:]),
|
|
|
|
ModTime: time.Unix(0, z.ModTime),
|
|
|
|
Signature: hex.EncodeToString(z.Signature[:]),
|
|
|
|
Type: z.Type,
|
|
|
|
Flags: z.Flags,
|
|
|
|
}
|
|
|
|
return json.Marshal(tmp)
|
|
|
|
}
|
2023-06-22 15:41:24 -04:00
|
|
|
|
|
|
|
func combine(files []string, out string) error {
|
|
|
|
sort.Strings(files)
|
|
|
|
var size, shards, data, parity int
|
|
|
|
mapped := make([]byte, size)
|
|
|
|
filled := make([]byte, size)
|
|
|
|
parityData := make(map[int]map[int][]byte)
|
|
|
|
fmt.Printf("Attempting to combine version %q.\n", out)
|
|
|
|
for _, file := range files {
|
|
|
|
b, err := os.ReadFile(file)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
meta, err := os.ReadFile(file + ".json")
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
type erasureInfo struct {
|
|
|
|
V2Obj *struct {
|
|
|
|
EcDist []int
|
|
|
|
EcIndex int
|
|
|
|
EcM int
|
|
|
|
EcN int
|
|
|
|
Size int
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var ei erasureInfo
|
|
|
|
var idx int
|
|
|
|
if err := json.Unmarshal(meta, &ei); err == nil && ei.V2Obj != nil {
|
|
|
|
if size == 0 {
|
|
|
|
size = ei.V2Obj.Size
|
|
|
|
mapped = make([]byte, size)
|
|
|
|
filled = make([]byte, size)
|
|
|
|
}
|
|
|
|
data = ei.V2Obj.EcM
|
|
|
|
parity = ei.V2Obj.EcN
|
|
|
|
if shards == 0 {
|
|
|
|
shards = data + parity
|
|
|
|
}
|
|
|
|
idx = ei.V2Obj.EcIndex - 1
|
|
|
|
fmt.Println("Read shard", ei.V2Obj.EcIndex, "Data shards", data, "Parity", parity, fmt.Sprintf("(%s)", file))
|
|
|
|
if ei.V2Obj.Size != size {
|
|
|
|
return fmt.Errorf("size mismatch. Meta size: %d", ei.V2Obj.Size)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if len(b) < 32 {
|
|
|
|
return fmt.Errorf("file %s too short", file)
|
|
|
|
}
|
|
|
|
// Trim hash. Fine for inline data, since only one block.
|
|
|
|
b = b[32:]
|
|
|
|
|
|
|
|
set := parityData[data]
|
|
|
|
if set == nil {
|
|
|
|
set = make(map[int][]byte)
|
|
|
|
}
|
|
|
|
set[idx] = b
|
|
|
|
parityData[data] = set
|
|
|
|
|
|
|
|
// Combine
|
|
|
|
start := len(b) * idx
|
|
|
|
if start >= len(mapped) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
copy(mapped[start:], b)
|
|
|
|
for j := range b {
|
|
|
|
if j+start >= len(filled) {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
filled[j+start] = 1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
lastValid := 0
|
|
|
|
missing := 0
|
|
|
|
for i := range filled {
|
|
|
|
if filled[i] == 1 {
|
|
|
|
lastValid = i
|
|
|
|
} else {
|
|
|
|
missing++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if missing > 0 && len(parityData) > 0 {
|
|
|
|
fmt.Println("Attempting to reconstruct using parity sets:")
|
|
|
|
for k, v := range parityData {
|
|
|
|
if missing == 0 {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
fmt.Println("* Setup: Data shards:", k, "- Parity blocks:", len(v))
|
|
|
|
rs, err := reedsolomon.New(k, shards-k)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
split, err := rs.Split(mapped)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
splitFilled, err := rs.Split(filled)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
ok := len(splitFilled)
|
|
|
|
for i, sh := range splitFilled {
|
|
|
|
for _, v := range sh {
|
|
|
|
if v == 0 {
|
|
|
|
split[i] = nil
|
|
|
|
ok--
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
hasParity := 0
|
|
|
|
for idx, sh := range v {
|
|
|
|
split[idx] = sh
|
|
|
|
if idx >= k && len(v) > 0 {
|
|
|
|
hasParity++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fmt.Printf("Have %d complete remapped data shards and %d complete parity shards. ", ok, hasParity)
|
|
|
|
|
|
|
|
if err := rs.ReconstructData(split); err == nil {
|
|
|
|
fmt.Println("Could reconstruct completely")
|
|
|
|
for i, data := range split[:k] {
|
|
|
|
start := i * len(data)
|
|
|
|
copy(mapped[start:], data)
|
|
|
|
}
|
|
|
|
lastValid = size - 1
|
|
|
|
missing = 0
|
|
|
|
} else {
|
|
|
|
fmt.Println("Could NOT reconstruct:", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if lastValid == 0 {
|
|
|
|
return errors.New("no valid data found")
|
|
|
|
}
|
|
|
|
if missing > 0 {
|
|
|
|
out += ".truncated"
|
|
|
|
} else {
|
|
|
|
out += ".complete"
|
|
|
|
}
|
|
|
|
fmt.Println(missing, "bytes missing. Truncating", len(filled)-lastValid-1, "from end.")
|
|
|
|
mapped = mapped[:lastValid+1]
|
|
|
|
err := os.WriteFile(out, mapped, os.ModePerm)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
fmt.Println("Wrote output to", out)
|
|
|
|
return nil
|
|
|
|
}
|