octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-16 01:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #934 from ggtakec/master

Browse Source 
Checked and corrected all typo
This commit is contained in:
Takeshi Nakatani 2019-01-27 21:33:16 +09:00 committed by GitHub
commit a442e843be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -46,7 +46,7 @@ Version 1.83 -- Dec 17, 2017
#638 - Minor fixes to README #638 - Minor fixes to README
#639 - Update Homebrew instructions #639 - Update Homebrew instructions
#642 - Fixed potential atomic violation in S3fsCurl::AddUserAgent - #633 #642 - Fixed potential atomic violation in S3fsCurl::AddUserAgent - #633
#644 - Fixed with unnecessary equal in POST uploads url argment - #643 #644 - Fixed with unnecessary equal in POST uploads url argument - #643
#645 - Configure S3Proxy for SSL #645 - Configure S3Proxy for SSL
#646 - Simplify S3Proxy PID handling #646 - Simplify S3Proxy PID handling
#652 - Fix s3fs_init message #652 - Fix s3fs_init message
@ -112,7 +112,7 @@ Version 1.81 -- May 13, 2017
#540 - Address cppcheck 1.77 warnings #540 - Address cppcheck 1.77 warnings
#545 - Changed base cached time of stat_cache_expire option - #523 #545 - Changed base cached time of stat_cache_expire option - #523
#546 - Fixed double initialization of SSL library at foreground #546 - Fixed double initialization of SSL library at foreground
#550 - Add umount instruction for unplivileged user #550 - Add umount instruction for unprivileged user
#551 - Updated stat_cache_expire option description - #545 #551 - Updated stat_cache_expire option description - #545
#552 - switch S3fsMultiCurl to use foreground threads #552 - switch S3fsMultiCurl to use foreground threads
#553 - add TLS cipher suites customization #553 - add TLS cipher suites customization
@ -165,7 +165,7 @@ Version 1.80 -- May 29, 2016
#250 - s3fs can print version with short commit hash - #228 #250 - s3fs can print version with short commit hash - #228
#251 - Skip xattr tests if utilities are missing #251 - Skip xattr tests if utilities are missing
#252 - This fixes an issue with caching when the creation of a subdirectory … #252 - This fixes an issue with caching when the creation of a subdirectory …
#253 - Added chacking cache dir perms at starting. #253 - Added checking cache dir perms at starting.
#256 - Add no atomic rename to limitations #256 - Add no atomic rename to limitations
#257 - Update README.md: Bugfix password file permissions errors #257 - Update README.md: Bugfix password file permissions errors
#258 - Update README.md to better explain mount upon boot #258 - Update README.md to better explain mount upon boot
@ -193,7 +193,7 @@ Version 1.80 -- May 29, 2016
#306 - Fix read concurrency to work in parallel count #306 - Fix read concurrency to work in parallel count
#307 - Fix pthread portability problem #307 - Fix pthread portability problem
#308 - Changed ensure free disk space as additional change for #306 #308 - Changed ensure free disk space as additional change for #306
#309 - Check pthread prtability in configure as additional change for #307 #309 - Check pthread portability in configure as additional change for #307
#310 - Update integration-test-main.sh as additional change for #300 #310 - Update integration-test-main.sh as additional change for #300
#311 - Change error log to debug log in s3fs_read() #311 - Change error log to debug log in s3fs_read()
#313 - fix gitignore #313 - fix gitignore
@ -205,14 +205,14 @@ Version 1.80 -- May 29, 2016
#330 - Pass by const reference where possible #330 - Pass by const reference where possible
#331 - Address various clang warnings #331 - Address various clang warnings
#334 - Bucket host should include port and not path #334 - Bucket host should include port and not path
#336 - update REAME.md for fstab #336 - update README.md for fstab
#338 - Fixed a bug about IAMCRED type could not be retried. #338 - Fixed a bug about IAMCRED type could not be retried.
#339 - Updated README.md for fstab example. #339 - Updated README.md for fstab example.
#341 - Fix the memory leak issue in fdcache. #341 - Fix the memory leak issue in fdcache.
#346 - Fix empty directory check against AWS S3 #346 - Fix empty directory check against AWS S3
#348 - Integration test summary, continue on error #348 - Integration test summary, continue on error
#350 - Changed cache out logic for stat - #340 #350 - Changed cache out logic for stat - #340
#351 - Check cache dirctory path and attributes - #347 #351 - Check cache directory path and attributes - #347
#352 - Remove stat file cache dir if specified del_cache - #337 #352 - Remove stat file cache dir if specified del_cache - #337
#354 - Supported regex type for additional header format - #343 #354 - Supported regex type for additional header format - #343
#355 - Fixed codes about clock_gettime for osx #355 - Fixed codes about clock_gettime for osx
@ -289,7 +289,7 @@ issue #184 - Add usage information for multipart_size
issue #185 - Correct obvious typos in usage and README issue #185 - Correct obvious typos in usage and README
issue #190 - Add a no_check_certificate option. issue #190 - Add a no_check_certificate option.
issue #194 - Tilda in a file-name breaks things (EPERM) issue #194 - Tilda in a file-name breaks things (EPERM)
issue #198 - Disasble integration tests for Travis issue #198 - Disable integration tests for Travis
issue #199 - Supported extended attributes(retry) issue #199 - Supported extended attributes(retry)
issue #200 - fixed fallback to sigv2 for bucket create and GCS issue #200 - fixed fallback to sigv2 for bucket create and GCS
issue #202 - Specialize {set,get}xattr for OS X issue #202 - Specialize {set,get}xattr for OS X

2
doc/man/s3fs.1
View File

@ -299,7 +299,7 @@ Most of the generic mount options described in 'man mount' are supported (ro, rw
There are many FUSE specific mount options that can be specified. e.g. allow_other. See the FUSE README for the full set. There are many FUSE specific mount options that can be specified. e.g. allow_other. See the FUSE README for the full set.
.SH NOTES .SH NOTES
.TP .TP
The maximum size of objects that s3fs can handle depends on Amazone S3. For example, up to 5 GB when using single PUT API. And up to 5 TB is supported when Multipart Upload API is used. The maximum size of objects that s3fs can handle depends on Amazon S3. For example, up to 5 GB when using single PUT API. And up to 5 TB is supported when Multipart Upload API is used.
.TP .TP
If enabled via the "use_cache" option, s3fs automatically maintains a local cache of files in the folder specified by use_cache. Whenever s3fs needs to read or write a file on S3, it first downloads the entire file locally to the folder specified by use_cache and operates on it. When fuse_release() is called, s3fs will re-upload the file to S3 if it has been changed. s3fs uses md5 checksums to minimize downloads from S3. If enabled via the "use_cache" option, s3fs automatically maintains a local cache of files in the folder specified by use_cache. Whenever s3fs needs to read or write a file on S3, it first downloads the entire file locally to the folder specified by use_cache and operates on it. When fuse_release() is called, s3fs will re-upload the file to S3 if it has been changed. s3fs uses md5 checksums to minimize downloads from S3.
.TP .TP

2
src/fdcache.cpp
View File

@ -1774,7 +1774,7 @@ void FdEntity::CleanupCache()
} }
if (is_modify) { if (is_modify) {
// cache is not commited to s3, cannot cleanup // cache is not committed to s3, cannot cleanup
return; return;
} }

6
src/psemaphore.h
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef S3FS_SEMAPHONE_H_ #ifndef S3FS_SEMAPHORE_H_
#define S3FS_SEMAPHONE_H_ #define S3FS_SEMAPHORE_H_
// portability wrapper for sem_t since macOS does not implement it // portability wrapper for sem_t since macOS does not implement it
@ -72,4 +72,4 @@ class Semaphore
#endif #endif
#endif // S3FS_SEMAPHONE_H_ #endif // S3FS_SEMAPHORE_H_

6
src/s3fs_util.cpp
View File

@ -259,7 +259,7 @@ bool S3ObjList::GetNameList(s3obj_list_t& list, bool OnlyNormalized, bool CutSla
} }
string name = (*iter).first; string name = (*iter).first;
if(CutSlash && 1 < name.length() && '/' == name[name.length() - 1]){ if(CutSlash && 1 < name.length() && '/' == name[name.length() - 1]){
// only "/" string is skio this. // only "/" string is skipped this.
name = name.substr(0, name.length() - 1); name = name.substr(0, name.length() - 1);
} }
list.push_back(name); list.push_back(name);
@ -661,7 +661,7 @@ bool check_exist_dir_permission(const char* dirpath)
struct stat st; struct stat st;
if(0 != stat(dirpath, &st)){ if(0 != stat(dirpath, &st)){
if(ENOENT == errno){ if(ENOENT == errno){
// dir does not exitst // dir does not exist
return true; return true;
} }
if(EACCES == errno){ if(EACCES == errno){
@ -848,7 +848,7 @@ mode_t get_mode(headers_t& meta, const char* path, bool checkdir, bool forcedir)
mode |= S_IFDIR; mode |= S_IFDIR;
}else{ }else{
if(complement_stat){ if(complement_stat){
// If complement lack stat mode, when the object has '/' charactor at end of name // If complement lack stat mode, when the object has '/' character at end of name
// and content type is text/plain and the object's size is 0 or 1, it should be // and content type is text/plain and the object's size is 0 or 1, it should be
// directory. // directory.
off_t size = get_size(meta); off_t size = get_size(meta);

4
test/integration-test-common.sh
View File

@ -146,14 +146,14 @@ function start_s3fs {
# If VALGRIND is set, pass it as options to valgrind. # If VALGRIND is set, pass it as options to valgrind.
# start valgrind-listener in another shell. # start valgrind-listener in another shell.
# eg: VALGRIND="--tool=memcheck --leak-check=full" ./small-integration-test.sh # eg: VALGRIND="--tool=memcheck --leak-check=full" ./small-integration-test.sh
# Start valgind-listener (default port is 1500) # Start valgrind-listener (default port is 1500)
if [ -n "${VALGRIND}" ]; then if [ -n "${VALGRIND}" ]; then
VALGRIND_EXEC="valgrind ${VALGRIND} --log-socket=127.0.1.1" VALGRIND_EXEC="valgrind ${VALGRIND} --log-socket=127.0.1.1"
fi fi
# Common s3fs options: # Common s3fs options:
# #
# TODO: Allow all these options to be overriden with env variables # TODO: Allow all these options to be overridden with env variables
# #
# use_path_request_style # use_path_request_style
# The test env doesn't have virtual hosts # The test env doesn't have virtual hosts

16
test/mergedir.sh
View File

@ -7,12 +7,12 @@
### ###
### UsageFunction <program name> ### UsageFunction <program name>
### ###
UsageFuntion() UsageFunction()
{ {
echo "Usage: $1 [-h] [-y] [-all] <base directory>" echo "Usage: $1 [-h] [-y] [-all] <base directory>"
echo " -h print usage" echo " -h print usage"
echo " -y no confirm" echo " -y no confirm"
echo " -all force all directoris" echo " -all force all directories"
echo " There is no -all option is only to merge for other S3 client." echo " There is no -all option is only to merge for other S3 client."
echo " If -all is specified, this shell script merge all directory" echo " If -all is specified, this shell script merge all directory"
echo " for s3fs old version." echo " for s3fs old version."
@ -28,7 +28,7 @@ DIRPARAM=""
while [ "$1" != "" ]; do while [ "$1" != "" ]; do
if [ "X$1" = "X-help" -o "X$1" = "X-h" -o "X$1" = "X-H" ]; then if [ "X$1" = "X-help" -o "X$1" = "X-h" -o "X$1" = "X-H" ]; then
UsageFuntion $OWNNAME UsageFunction $OWNNAME
exit 0 exit 0
elif [ "X$1" = "X-y" -o "X$1" = "X-Y" ]; then elif [ "X$1" = "X-y" -o "X$1" = "X-Y" ]; then
AUTOYES="yes" AUTOYES="yes"
@ -38,7 +38,7 @@ while [ "$1" != "" ]; do
if [ "X$DIRPARAM" != "X" ]; then if [ "X$DIRPARAM" != "X" ]; then
echo "*** Input error." echo "*** Input error."
echo "" echo ""
UsageFuntion $OWNNAME UsageFunction $OWNNAME
exit 1 exit 1
fi fi
DIRPARAM=$1 DIRPARAM=$1
@ -48,7 +48,7 @@ done
if [ "X$DIRPARAM" = "X" ]; then if [ "X$DIRPARAM" = "X" ]; then
echo "*** Input error." echo "*** Input error."
echo "" echo ""
UsageFuntion $OWNNAME UsageFunction $OWNNAME
exit 1 exit 1
fi fi
@ -62,7 +62,7 @@ fi
echo "#############################################################################" echo "#############################################################################"
echo "[CAUTION]" echo "[CAUTION]"
echo "This program merges a directory made in s3fs which is older than version 1.64." echo "This program merges a directory made in s3fs which is older than version 1.64."
echo "And made in other S3 client appilication." echo "And made in other S3 client application."
echo "This program may be have bugs which are not fixed yet." echo "This program may be have bugs which are not fixed yet."
echo "Please execute this program by responsibility of your own." echo "Please execute this program by responsibility of your own."
echo "#############################################################################" echo "#############################################################################"
@ -104,7 +104,7 @@ for DIR in $DIRLIST; do
if [ "$ALLYES" = "no" ]; then if [ "$ALLYES" = "no" ]; then
### Skip "d---------" directories. ### Skip "d---------" directories.
### Other clients make directory object "dir/" which don't have ### Other clients make directory object "dir/" which don't have
### "x-amz-meta-mode" attribyte. ### "x-amz-meta-mode" attribute.
### Then these directories is "d---------", it is target directory. ### Then these directories is "d---------", it is target directory.
DIRPERMIT=`ls -ld --time-style=+'%Y%m%d%H%M' $DIR | awk '{print $1}'` DIRPERMIT=`ls -ld --time-style=+'%Y%m%d%H%M' $DIR | awk '{print $1}'`
if [ "$DIRPERMIT" != "d---------" ]; then if [ "$DIRPERMIT" != "d---------" ]; then
@ -112,7 +112,7 @@ for DIR in $DIRLIST; do
fi fi
fi fi
### Comfirm ### Confirm
ANSWER="" ANSWER=""
if [ "$AUTOYES" = "yes" ]; then if [ "$AUTOYES" = "yes" ]; then
ANSWER="y" ANSWER="y"