mirror of
https://github.com/versity/versitygw.git
synced 2025-12-23 05:05:16 +00:00
feat: compile support for 32bit and bsd platforms
This commit is contained in:
@@ -6,6 +6,7 @@ builds:
|
|||||||
- goos:
|
- goos:
|
||||||
- linux
|
- linux
|
||||||
- darwin
|
- darwin
|
||||||
|
- freebsd
|
||||||
# windows is untested, we can start doing windows releases
|
# windows is untested, we can start doing windows releases
|
||||||
# if someone is interested in taking on testing
|
# if someone is interested in taking on testing
|
||||||
# - windows
|
# - windows
|
||||||
|
|||||||
@@ -435,7 +435,7 @@ func loadUserMetaData(path string, m map[string]string) (contentType, contentEnc
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
b, err := xattr.Get(path, e)
|
b, err := xattr.Get(path, e)
|
||||||
if err == syscall.ENODATA {
|
if err == errNoData {
|
||||||
m[strings.TrimPrefix(e, fmt.Sprintf("user.%v.", metaHdr))] = ""
|
m[strings.TrimPrefix(e, fmt.Sprintf("user.%v.", metaHdr))] = ""
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -1934,7 +1934,7 @@ func isNoAttr(err error) bool {
|
|||||||
if ok && xerr.Err == xattr.ENOATTR {
|
if ok && xerr.Err == xattr.ENOATTR {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
if err == syscall.ENODATA {
|
if err == errNoData {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
// Copyright 2023 Versity Software
|
|
||||||
// This file is licensed under the Apache License, Version 2.0
|
|
||||||
// (the "License"); you may not use this file except in compliance
|
|
||||||
// with the License. You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing,
|
|
||||||
// software distributed under the License is distributed on an
|
|
||||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
// KIND, either express or implied. See the License for the
|
|
||||||
// specific language governing permissions and limitations
|
|
||||||
// under the License.
|
|
||||||
|
|
||||||
package posix
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/sha256"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io/fs"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
)
|
|
||||||
|
|
||||||
type tmpfile struct {
|
|
||||||
f *os.File
|
|
||||||
bucket string
|
|
||||||
objname string
|
|
||||||
size int64
|
|
||||||
}
|
|
||||||
|
|
||||||
func openTmpFile(dir, bucket, obj string, size int64) (*tmpfile, error) {
|
|
||||||
// Create a temp file for upload while in progress (see link comments below).
|
|
||||||
err := os.MkdirAll(dir, 0700)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("make temp dir: %w", err)
|
|
||||||
}
|
|
||||||
f, err := os.CreateTemp(dir,
|
|
||||||
fmt.Sprintf("%x.", sha256.Sum256([]byte(obj))))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &tmpfile{f: f, bucket: bucket, objname: obj, size: size}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tmp *tmpfile) link() error {
|
|
||||||
tempname := tmp.f.Name()
|
|
||||||
// cleanup in case anything goes wrong, if rename succeeds then
|
|
||||||
// this will no longer exist
|
|
||||||
defer os.Remove(tempname)
|
|
||||||
|
|
||||||
// We use Rename as the atomic operation for object puts. The upload is
|
|
||||||
// written to a temp file to not conflict with any other simultaneous
|
|
||||||
// uploads. The final operation is to move the temp file into place for
|
|
||||||
// the object. This ensures the object semantics of last upload completed
|
|
||||||
// wins and is not some combination of writes from simultaneous uploads.
|
|
||||||
objPath := filepath.Join(tmp.bucket, tmp.objname)
|
|
||||||
err := os.Remove(objPath)
|
|
||||||
if err != nil && !errors.Is(err, fs.ErrNotExist) {
|
|
||||||
return fmt.Errorf("remove stale path: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = tmp.f.Close()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("close tmpfile: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = os.Rename(tempname, objPath)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("rename tmpfile: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tmp *tmpfile) Write(b []byte) (int, error) {
|
|
||||||
if int64(len(b)) > tmp.size {
|
|
||||||
return 0, fmt.Errorf("write exceeds content length")
|
|
||||||
}
|
|
||||||
|
|
||||||
n, err := tmp.f.Write(b)
|
|
||||||
tmp.size -= int64(n)
|
|
||||||
return n, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tmp *tmpfile) cleanup() {
|
|
||||||
tmp.f.Close()
|
|
||||||
}
|
|
||||||
24
backend/posix/with_enodata.go
Normal file
24
backend/posix/with_enodata.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// Copyright 2024 Versity Software
|
||||||
|
// This file is licensed under the Apache License, Version 2.0
|
||||||
|
// (the "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
//go:build !freebsd && !openbsd && !netbsd
|
||||||
|
// +build !freebsd,!openbsd,!netbsd
|
||||||
|
|
||||||
|
package posix
|
||||||
|
|
||||||
|
import "syscall"
|
||||||
|
|
||||||
|
var (
|
||||||
|
errNoData = syscall.ENODATA
|
||||||
|
)
|
||||||
@@ -12,6 +12,9 @@
|
|||||||
// specific language governing permissions and limitations
|
// specific language governing permissions and limitations
|
||||||
// under the License.
|
// under the License.
|
||||||
|
|
||||||
|
//go:build linux
|
||||||
|
// +build linux
|
||||||
|
|
||||||
package posix
|
package posix
|
||||||
|
|
||||||
import (
|
import (
|
||||||
24
backend/posix/without_enodata.go
Normal file
24
backend/posix/without_enodata.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// Copyright 2024 Versity Software
|
||||||
|
// This file is licensed under the Apache License, Version 2.0
|
||||||
|
// (the "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
//go:build freebsd || openbsd || netbsd
|
||||||
|
// +build freebsd openbsd netbsd
|
||||||
|
|
||||||
|
package posix
|
||||||
|
|
||||||
|
import "syscall"
|
||||||
|
|
||||||
|
var (
|
||||||
|
errNoData = syscall.ENOATTR
|
||||||
|
)
|
||||||
@@ -12,6 +12,9 @@
|
|||||||
// specific language governing permissions and limitations
|
// specific language governing permissions and limitations
|
||||||
// under the License.
|
// under the License.
|
||||||
|
|
||||||
|
//go:build !linux
|
||||||
|
// +build !linux
|
||||||
|
|
||||||
package posix
|
package posix
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -25,7 +25,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go-v2/service/s3"
|
"github.com/aws/aws-sdk-go-v2/service/s3"
|
||||||
"github.com/aws/aws-sdk-go-v2/service/s3/types"
|
"github.com/aws/aws-sdk-go-v2/service/s3/types"
|
||||||
@@ -267,7 +266,7 @@ func loadUserMetaData(path string, m map[string]string) (contentType, contentEnc
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
b, err := xattr.Get(path, e)
|
b, err := xattr.Get(path, e)
|
||||||
if err == syscall.ENODATA {
|
if err == errNoData {
|
||||||
m[strings.TrimPrefix(e, "user.")] = ""
|
m[strings.TrimPrefix(e, "user.")] = ""
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -805,7 +804,7 @@ func isNoAttr(err error) bool {
|
|||||||
if ok && xerr.Err == xattr.ENOATTR {
|
if ok && xerr.Err == xattr.ENOATTR {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
if err == syscall.ENODATA {
|
if err == errNoData {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
|
|||||||
24
backend/scoutfs/with_enodata.go
Normal file
24
backend/scoutfs/with_enodata.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// Copyright 2024 Versity Software
|
||||||
|
// This file is licensed under the Apache License, Version 2.0
|
||||||
|
// (the "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
//go:build !freebsd && !openbsd && !netbsd
|
||||||
|
// +build !freebsd,!openbsd,!netbsd
|
||||||
|
|
||||||
|
package scoutfs
|
||||||
|
|
||||||
|
import "syscall"
|
||||||
|
|
||||||
|
var (
|
||||||
|
errNoData = syscall.ENODATA
|
||||||
|
)
|
||||||
24
backend/scoutfs/without_enodata.go
Normal file
24
backend/scoutfs/without_enodata.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// Copyright 2024 Versity Software
|
||||||
|
// This file is licensed under the Apache License, Version 2.0
|
||||||
|
// (the "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
//go:build freebsd || openbsd || netbsd
|
||||||
|
// +build freebsd openbsd netbsd
|
||||||
|
|
||||||
|
package scoutfs
|
||||||
|
|
||||||
|
import "syscall"
|
||||||
|
|
||||||
|
var (
|
||||||
|
errNoData = syscall.ENOATTR
|
||||||
|
)
|
||||||
24
s3select/arch32.go
Normal file
24
s3select/arch32.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// Copyright 2023 Versity Software
|
||||||
|
// This file is licensed under the Apache License, Version 2.0
|
||||||
|
// (the "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
//go:build !amd64 && !arm64 && !ppc64le && !riscv64
|
||||||
|
// +build !amd64,!arm64,!ppc64le,!riscv64
|
||||||
|
|
||||||
|
package s3select
|
||||||
|
|
||||||
|
import "math"
|
||||||
|
|
||||||
|
const (
|
||||||
|
maxMessageSize = math.MaxInt
|
||||||
|
)
|
||||||
22
s3select/arch64.go
Normal file
22
s3select/arch64.go
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
// Copyright 2023 Versity Software
|
||||||
|
// This file is licensed under the Apache License, Version 2.0
|
||||||
|
// (the "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
//go:build amd64 || arm64 || ppc64le || riscv64
|
||||||
|
// +build amd64 arm64 ppc64le riscv64
|
||||||
|
|
||||||
|
package s3select
|
||||||
|
|
||||||
|
const (
|
||||||
|
maxMessageSize = 5 * 1024 * 1024 * 1024
|
||||||
|
)
|
||||||
@@ -123,8 +123,7 @@ func generatePrelude(msgLen int, headerLen int) []byte {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
maxHeaderSize = 1024 * 1024
|
maxHeaderSize = 1024 * 1024
|
||||||
maxMessageSize = 5 * 1024 * 1024 * 1024
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func genMessage(header, payload []byte) []byte {
|
func genMessage(header, payload []byte) []byte {
|
||||||
|
|||||||
Reference in New Issue
Block a user