Merge branch 'release-2.00.0' into stable

.github/workflows/run-unit-tests.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
+set -e
+set -x
+
+cd /gopathroot/src/github.com/NVIDIA/proxyfs
+
+go get github.com/mattn/goveralls
+
+make ci
+
+# $COVERALLS_TOKEN must be configured in the CI/CD environment
+if [ -n "$COVERALLS_TOKEN" ] && [ -n "$GIT_BRANCH" ]; then
+    goveralls -coverprofile coverage.coverprofile -service travis-ci -repotoken $COVERALLS_TOKEN || true
+fi

.github/workflows/run-unit-tests.yml

@@ -9,7 +9,7 @@ jobs:
           fetch-depth: 0
           submodules: false
       - name: Build, run unit tests, and get coverage
-        run: docker run -e "COVERALLS_TOKEN=${{ secrets.COVERALLS_TOKEN }}" -e "GIT_BRANCH=${{ github.ref }}" --cap-add SYS_ADMIN --device /dev/fuse -i -v `pwd`:/gopathroot/src/github.com/NVIDIA/proxyfs swiftstack/proxyfs_unit_tests
+        run: docker run -e "COVERALLS_TOKEN=${{ secrets.COVERALLS_TOKEN }}" -e "GIT_BRANCH=${{ github.ref }}" --cap-add SYS_ADMIN --device /dev/fuse -i -v `pwd`:/gopathroot/src/github.com/NVIDIA/proxyfs golang:1.17.2 /bin/bash -c "/gopathroot/src/github.com/NVIDIA/proxyfs/.github/workflows/run-unit-tests.sh"
       - name: Slack Notification
         uses: rtCamp/action-slack-notify@v2
         env:

.gitignore

@@ -24,6 +24,7 @@ CommonVolume.rlog
 
 # specific binaries
 jrpcfs/test/client
+go-acc
 
 # Folders
 _obj

Dockerfile

@@ -0,0 +1,120 @@
+# Copyright (c) 2015-2022, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
+# To build this image:
+#
+#   docker build                                      \
+#          --target {base|dev|build|deploy}           \
+#          [--build-arg GolangVersion=<X.YY.Z>]       \
+#          [--build-arg MakeTarget={|all|ci|minimal}] \
+#          [-t <repository>[:<tag>]]                  .
+#
+#   Notes:
+#     --target base:
+#       1) provides a clean/small base image for the rest to leverage
+#       2) only addition is libc6-compat to enable Golang runtime compatibility
+#     --target dev:
+#       1) builds an image capable of building all elements
+#       2) /src is shared with context dir of host
+#     --target build:
+#       1) clones the context dir at /clone
+#       2) performs a make clean to clear out non-source-controlled artifacts
+#       3) performs a make $MakeTarget
+#     --target deploy:
+#       1) provides a minimal image containing ickpt, imgr, and iclient
+#       2) also includes the icert tool useful for the following steps
+#       3) creates TLS cert/key files for RootCA
+#       4) creates TLS cert/key files for ickpt
+#       5) creates TLS cert/key files for imgr
+#     --build-arg GolangVersion:
+#       1) identifies Golang version
+#       2) default specified in ARG GolangVersion line in --target base
+#     --build-arg MakeTarget:
+#       1) identifies Makefile target(s) to build (following make clean)
+#       2) defaults to blank (equivalent to "minimal")
+#       3) only used in --target build
+#     -t:
+#       1) provides a name REPOSITORY:TAG for the built image
+#       2) if no tag is specified, TAG will be "latest"
+#       3) if no repository is specified, only the IMAGE ID will identify the built image
+#
+# To run the resultant image:
+#
+#   docker run                                                        \
+#          [-d|--detach]                                              \
+#          [-it]                                                      \
+#          [--rm]                                                     \
+#          [--privileged]                                             \
+#          [--mount src="$(pwd)",target="/src",type=bind]             \
+#          [--env DISPLAY=<hostOrIP>:<displayNumber>[.<screenNumber]] \
+#          <image id>|<repository>[:<tag>]
+#
+#   Notes:
+#     -d|--detach:   tells Docker to detach from running container 
+#     -it:           tells Docker to run container interactively
+#     --rm:          tells Docker to destroy container upon exit
+#     --privileged:
+#       1) tells Docker to, among other things, grant access to /dev/fuse
+#       2) only useful for --target dev and --target iclient
+#     --mount:
+#       1) bind mounts the context into /src in the container
+#       2) /src will be a read-write'able equivalent to the context dir
+#       3) only useful for --target dev
+#     --env DISPLAY: tells Docker to set ENV DISPLAY for X apps (e.g. wireshark)
+
+FROM alpine:3.15.0 as base
+RUN apk add --no-cache libc6-compat
+
+FROM base as dev
+ARG GolangVersion=1.17.5
+RUN apk add --no-cache               \
+                       bind-tools    \
+                       curl          \
+                       fio           \
+                       fuse          \
+                       gcc           \
+                       git           \
+                       jq            \
+                       libc-dev      \
+                       make          \
+                       tar           \
+                       terminus-font \
+                       wireshark
+ENV LIBGL_ALWAYS_INDIRECT=1
+ENV XDG_RUNTIME_DIR="/tmp/runtime-root"
+ENV GolangBasename="go${GolangVersion}.linux-amd64.tar.gz"
+ENV GolangURL="https://golang.org/dl/${GolangBasename}"
+WORKDIR /tmp
+RUN wget -nv ${GolangURL}
+RUN tar -C /usr/local -xzf $GolangBasename
+ENV PATH $PATH:/usr/local/go/bin
+RUN git clone https://github.com/go-delve/delve
+WORKDIR /tmp/delve
+RUN go build github.com/go-delve/delve/cmd/dlv
+RUN cp dlv /usr/local/go/bin/.
+VOLUME /src
+WORKDIR /src
+
+FROM dev as build
+ARG MakeTarget
+COPY . /clone
+WORKDIR /clone
+RUN make clean
+RUN make $MakeTarget
+
+FROM base as deploy
+RUN apk add --no-cache      \
+                       curl \
+                       fuse
+COPY --from=build /clone/iauth/iauth-swift/iauth-swift.so ./
+COPY --from=build /clone/ickpt/ickpt                      ./
+COPY --from=build /clone/ickpt/ickpt.conf                 ./
+COPY --from=build /clone/icert/icert                      ./
+COPY --from=build /clone/iclient/iclient                  ./
+COPY --from=build /clone/iclient/iclient.conf             ./
+COPY --from=build /clone/iclient/iclient.sh               ./
+COPY --from=build /clone/imgr/imgr                        ./
+COPY --from=build /clone/imgr/imgr.conf                   ./
+RUN ./icert -ca -ed25519 -caCert ca_cert.pem -caKey ca_key.pem -commonName RootCA -ttl 3560
+RUN ./icert     -ed25519 -caCert ca_cert.pem -caKey ca_key.pem -commonName ickpt  -ttl 3560 -cert ickpt_cert.pem -key ickpt_key.pem -dns ickpt
+RUN ./icert     -ed25519 -caCert ca_cert.pem -caKey ca_key.pem -commonName imgr   -ttl 3560 -cert imgr_cert.pem  -key imgr_key.pem  -dns imgr

GoMakefile

@@ -3,13 +3,18 @@
 
 # GoMakefile is a template to be included by Go package Makefile's in this repo
 
-all: version fmt generate install test
+minimal: generate build
 
-.PHONY: all bench clean cover fmt generate get install test
+all: fmt minimal test
+
+.PHONY: all bench build clean cover fmt generate minimal test
 
 bench:
 	go test -bench $(gosubdir)
 
+build:
+	go build -gcflags "-N -l" $(gosubdir)
+
 clean:
 	@set -e; \
 	go clean -i $(gosubdir); \
@@ -26,12 +31,5 @@ fmt:
 generate:
 	go generate $(gosubdir)
 
-install:
-	go install -gcflags "-N -l" $(gosubdir)
-
 test:
 	go test -vet all $(gosubdir)
-
-version:
-	@go version
-

GoPlugInMakefile

@@ -3,17 +3,22 @@
 
 # GoPlugInMakefile is a template to be included by Go PlugIn Makefile's in this repo
 
-all: version fmt generate install test
+minimal: generate build
 
-.PHONY: all bench clean cover fmt generate get install test
+all: fmt minimal test
+
+.PHONY: all bench build clean cover fmt generate minimal test
 
 bench:
 	go test -bench $(gosubdir)
 
+build:
+	@set -e; \
+	go build -buildmode=plugin $(gosubdir)
+
 clean:
 	@set -e; \
 	go clean -i $(gosubdir); \
-	rm -f $(GOPATH)/bin/$(plugin); \
 	for generatedfile in $(generatedfiles); do \
 		rm -f $$generatedfile; \
 	done
@@ -27,14 +32,5 @@ fmt:
 generate:
 	go generate $(gosubdir)
 
-install:
-	@set -e; \
-	go build -buildmode=plugin $(gosubdir); \
-	cp $(plugin) $(GOPATH)/bin/.
-
 test:
 	go test -vet all $(gosubdir)
-
-version:
-	@go version
-