From a98c4dfc47e0e4e20b38baf6e879a3e3da537ef2 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Tue, 12 Nov 2019 14:54:29 +0900 Subject: [PATCH] HADOOP-16702. Move documentation of hadoop-cos to under src directory. Signed-off-by: Masatake Iwasaki --- .../hadoop-cos/{ => src}/site/markdown/cloud-storage/index.md | 2 +- .../hadoop-cos/{ => src}/site/resources/css/site.css | 0 hadoop-project/src/site/site.xml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename hadoop-cloud-storage-project/hadoop-cos/{ => src}/site/markdown/cloud-storage/index.md (96%) rename hadoop-cloud-storage-project/hadoop-cos/{ => src}/site/resources/css/site.css (100%) diff --git a/hadoop-cloud-storage-project/hadoop-cos/site/markdown/cloud-storage/index.md b/hadoop-cloud-storage-project/hadoop-cos/src/site/markdown/cloud-storage/index.md similarity index 96% rename from hadoop-cloud-storage-project/hadoop-cos/site/markdown/cloud-storage/index.md rename to hadoop-cloud-storage-project/hadoop-cos/src/site/markdown/cloud-storage/index.md index 7049b3f0f0..d4f8728924 100644 --- a/hadoop-cloud-storage-project/hadoop-cos/site/markdown/cloud-storage/index.md +++ b/hadoop-cloud-storage-project/hadoop-cos/src/site/markdown/cloud-storage/index.md @@ -237,7 +237,7 @@ Hadoop-COS provides rich runtime properties to set, and most of these do not req | properties | description | default value | required | |:----------:|:-----------|:-------------:|:--------:| | fs.defaultFS | Configure the default file system used by Hadoop.| None | NO | -| fs.cosn.credentials.provider | This option allows the user to specify how to get the credentials. Comma-separated class names of credential provider classes which implement com.qcloud.cos.auth.COSCredentialsProvider:
1. org.apache.hadoop.fs.cos.auth.SimpleCredentialProvider: Obtain the secret id and secret key from `fs.cosn.userinfo.secretId` and `fs.cosn.userinfo.secretKey` in core-site.xml;
2. org.apache.hadoop.fs.auth.EnvironmentVariableCredentialProvider: Obtain the secret id and secret key from system environment variables named `COSN_SECRET_ID` and `COSN_SECRET_KEY`.

If unspecified, the default order of credential providers is:
1. org.apache.hadoop.fs.auth.SimpleCredentialProvider;
2. org.apache.hadoop.fs.auth.EnvironmentVariableCredentialProvider. | None | NO | +| fs.cosn.credentials.provider | This option allows the user to specify how to get the credentials. Comma-separated class names of credential provider classes which implement com.qcloud.cos.auth.COSCredentialsProvider:
1. org.apache.hadoop.fs.cos.auth.SimpleCredentialProvider: Obtain the secret id and secret key from `fs.cosn.userinfo.secretId` and `fs.cosn.userinfo.secretKey` in core-site.xml;
2. org.apache.hadoop.fs.auth.EnvironmentVariableCredentialProvider: Obtain the secret id and secret key from system environment variables named `COSN_SECRET_ID` and `COSN_SECRET_KEY`.

If unspecified, the default order of credential providers is:
1. org.apache.hadoop.fs.auth.SimpleCredentialProvider;
2. org.apache.hadoop.fs.auth.EnvironmentVariableCredentialProvider. | None | NO | | fs.cosn.userinfo.secretId/secretKey | The API key information of your account | None | YES | | fs.cosn.bucket.region | The region where the bucket is located. | None | YES | | fs.cosn.impl | The implementation class of the CosN filesystem. | None | YES | diff --git a/hadoop-cloud-storage-project/hadoop-cos/site/resources/css/site.css b/hadoop-cloud-storage-project/hadoop-cos/src/site/resources/css/site.css similarity index 100% rename from hadoop-cloud-storage-project/hadoop-cos/site/resources/css/site.css rename to hadoop-cloud-storage-project/hadoop-cos/src/site/resources/css/site.css diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml index 6ed2b32c97..25723a1eef 100644 --- a/hadoop-project/src/site/site.xml +++ b/hadoop-project/src/site/site.xml @@ -187,7 +187,7 @@ - +