Merge branch 'Alluxio:main' into multipartupload

common/transport/src/main/proto/grpc/file_system_master.proto

@@ -152,6 +152,7 @@ message CreateFilePOptions {
   // If specified, the data will be written to the certain worker
   optional grpc.WorkerNetAddress workerLocation = 15;
   optional bool isAtomicWrite = 16;
+  optional bool useMultipartUpload = 17;
 }
 message CreateFilePRequest {
   /** the path of the file */

conf/etcd/etcd.conf.template

@@ -0,0 +1,69 @@
+# This is the configuration file to start a etcd instance
+# e.g. /usr/local/bin/etcd --config-file /etc/etcd/etcd.conf 
+# *******README******
+# To make etcd a linux service:
+# After installation of etcd, make sure etcd and etcdctl
+# are available in /usr/local/bin
+# To make etcd a linux service:
+# Copy alluxio/conf/etcd/etcd.service.template to /etc/systemd/system/etcd.service
+# Copy alluxio/conf/etcd/etcd.conf.template to /etc/etcd/etcd.conf
+# For each etcd instance, change the config params in etcd.conf
+# accordingly.
+# And do:
+# #systemctl daemon-reload 
+# Then etcd could be registered as a linux service
+# e.g.
+# Check status
+# #service etcd status
+# Start etcd
+# #service etcd start
+# Stop etcd
+# #service etcd stop
+
+
+# Human-readable name for this member.
+#name: 'etcd1'
+
+# Path to the data directory.
+data-dir: /etcd-data-dir/data
+
+# Path to the dedicated wal directory.
+wal-dir: /etcd-data-dir/wal
+
+
+# List of comma separated URLs to listen on for peer traffic.
+#give ip/hostname of this etcd instance
+listen-peer-urls: http://<hostname_or_ip>:2380
+
+# List of comma separated URLs to listen on for client traffic.
+#give ip/hostname of this etcd instance
+listen-client-urls: http://<hostname_or_ip>:2379,http://127.0.0.1:2379
+
+# List of this member's peer URLs to advertise to the rest of the cluster.
+# The URLs needed to be a comma-separated list.
+#give ip/hostname of this etcd instance for remote etcd members communication
+initial-advertise-peer-urls: http://<hostname_or_ip>:2380
+
+# List of this member's client URLs to advertise to the public.
+# The URLs needed to be a comma-separated list.
+#give ip/hostname of this etcd instance for etcd client communication
+advertise-client-urls: http://<hostname_or_ip>:2379
+
+# Initial cluster configuration for bootstrapping.
+#give all ip/hostnames of members of initial etcd cluster
+initial-cluster: etcd0=http://<hostname_or_ip>:2380,etcd1=http://<hostname_or_ip>:2380,etcd2=http://<hostname_or_ip>:2380
+
+# Initial cluster token for the etcd cluster during bootstrap.
+#initial-cluster-token: 'etcd-cluster-1'
+
+# Initial cluster state ('new' or 'existing').
+initial-cluster-state: 'new'
+
+# Enable debug-level logging for etcd.
+#log-level: debug
+
+#logger: zap
+
+# Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd.
+# log-outputs: [stderr]
+

conf/etcd/etcd.service.template

@@ -0,0 +1,11 @@
+[Unit]
+Description=Etcd Service
+
+[Service]	
+ExecStart=/usr/local/bin/etcd --config-file /etc/etcd/etcd.conf
+KillSignal=SIGTERM
+StandardOutput=append:/var/log/etcd.log
+StandardError=append:/var/log/etcd.err
+
+[Install]
+WantedBy=default.target

dev/scripts/src/alluxio.org/build/cmd/build.go

@@ -199,14 +199,15 @@ func buildTarball(opts *buildOpts) error {
 func constructMavenCmd(mvnArgs []string) string {
 	cmd := []string{
 		"mvn",
-		"-am",                  // "also make": build dependent projects if a project list via `-pl` is specified
-		"clean",                // remove previously generated files
-		"install",              // maven build
-		"-DskipTests",          // skip unit tests
-		"-Dfindbugs.skip",      // skip findbugs static analysis check
-		"-Dmaven.javadoc.skip", // skip javadoc generation
-		"-Dcheckstyle.skip",    // skip checkstyle static check
-		"-Prelease",            // release profile specified in root pom.xml, to build dependency-reduced-pom.xml generated by shading plugin
+		"-am",                    // "also make": build dependent projects if a project list via `-pl` is specified
+		"clean",                  // remove previously generated files
+		"install",                // maven build
+		"-DskipTests",            // skip unit tests
+		"-Dfindbugs.skip",        // skip findbugs static analysis check
+		"-Dmaven.javadoc.skip",   // skip javadoc generation
+		"-Dcheckstyle.skip",      // skip checkstyle static check
+		"-Prelease",              // release profile specified in root pom.xml, to build dependency-reduced-pom.xml generated by shading plugin
+		"-Dhttp.keepAlive=false", // disable keep-alive for HTTP requests to deal with connection resets when fetching maven dependencies
 	}
 	if len(mvnArgs) > 0 {
 		cmd = append(cmd, mvnArgs...)

docs/_data/menu-en.yml

@@ -64,38 +64,40 @@
   - title: Storage Integrations
     buttonTitle: Storage_Integrations
     subfiles:
+      - title: Storage Integrations Overview
+        url: /en/ufs/Storage-Overview.html
       - title: Amazon AWS S3
         url: /en/ufs/S3.html
       - title: HDFS
         url: /en/ufs/HDFS.html
+      - title: Aliyun OSS
+        url: /en/ufs/Aliyun-OSS.html
       - title: Azure Blob Store
         url: /en/ufs/Azure-Blob-Store.html
       - title: Azure Data Lake Storage
         url: /en/ufs/Azure-Data-Lake.html
       - title: Azure Data Lake Storage Gen2
         url: /en/ufs/Azure-Data-Lake-Gen2.html
-      - title: Google Cloud Storage
-        url: /en/ufs/GCS.html
-      - title: Qiniu Kodo
-        url: /en/ufs/Qiniu-KODO.html
-      - title: Tencent COS
-        url: /en/ufs/COS.html
+      - title: CephFS
+        url: /en/ufs/CephFS.html
       - title: CephObjectStorage
         url: /en/ufs/CephObjectStorage.html
+      - title: Google Cloud Storage
+        url: /en/ufs/GCS.html
+      - title: Huawei OBS
+        url: /en/ufs/Huawei-OBS.html
       - title: MinIO
         url: /en/ufs/Minio.html
       - title: NFS
         url: /en/ufs/NFS.html
-      - title: Aliyun Object Storage Service
-        url: /en/ufs/OSS.html
       - title: Ozone
         url: /en/ufs/Ozone.html
+      - title: Qiniu Kodo
+        url: /en/ufs/Qiniu-KODO.html
       - title: Swift
         url: /en/ufs/Swift.html
-      - title: CephFS
-        url: /en/ufs/CephFS.html
-      - title: Huawei OBS
-        url: /en/ufs/OBS.html
+      - title: Tencent COS
+        url: /en/ufs/Tencent-COS.html
 
   - title: FUSE SDK
     buttonTitle: FUSE_SDK