thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #213 from vavrusa/master

Browse Source 
IO: Added ProfileEvents to Open/Read/Write failures
This commit is contained in:
alexey-milovidov 2016-12-01 22:28:36 +04:00 committed by GitHub
commit 9cea29e9a8
7 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Common/ProfileEvents.cpp
View File

@ -7,10 +7,13 @@
M(SelectQuery) \
M(InsertQuery) \
M(FileOpen) \
M(FileOpenFailed) \
M(Seek) \
M(ReadBufferFromFileDescriptorRead) \
M(ReadBufferFromFileDescriptorReadFailed) \
M(ReadBufferFromFileDescriptorReadBytes) \
M(WriteBufferFromFileDescriptorWrite) \
M(WriteBufferFromFileDescriptorWriteFailed) \
M(WriteBufferFromFileDescriptorWriteBytes) \
M(ReadBufferAIORead) \
M(ReadBufferAIOReadBytes) \

2
dbms/src/IO/ReadBufferAIO.cpp
View File

@ -12,6 +12,7 @@
namespace ProfileEvents
{
extern const Event FileOpen;
extern const Event FileOpenFailed;
extern const Event ReadBufferAIORead;
extern const Event ReadBufferAIOReadBytes;
}
@ -49,6 +50,7 @@ ReadBufferAIO::ReadBufferAIO(const std::string & filename_, size_t buffer_size_,
fd = ::open(filename.c_str(), open_flags);
if (fd == -1)
{
ProfileEvents::increment(ProfileEvents::FileOpenFailed);
auto error_code = (errno == ENOENT) ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE;
throwFromErrno("Cannot open file " + filename, error_code);
}

9
dbms/src/IO/ReadBufferFromFile.cpp
View File

@ -8,6 +8,7 @@
namespace ProfileEvents
{
extern const Event FileOpen;
extern const Event FileOpenFailed;
}
@ -41,11 +42,19 @@ ReadBufferFromFile::ReadBufferFromFile(
fd = open(file_name.c_str(), flags == -1 ? O_RDONLY : flags);
if (-1 == fd)
{
ProfileEvents::increment(ProfileEvents::FileOpenFailed);
throwFromErrno("Cannot open file " + file_name, errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
}
#ifdef __APPLE__
if (o_direct)
{
if (fcntl(fd, F_NOCACHE, 1) == -1)
{
ProfileEvents::increment(ProfileEvents::FileOpenFailed);
throwFromErrno("Cannot set F_NOCACHE on file " + file_name, ErrorCodes::CANNOT_OPEN_FILE);
}
}
#endif
}

4
dbms/src/IO/ReadBufferFromFileDescriptor.cpp
View File

@ -16,6 +16,7 @@
namespace ProfileEvents
{
extern const Event ReadBufferFromFileDescriptorRead;
extern const Event ReadBufferFromFileDescriptorReadFailed;
extern const Event ReadBufferFromFileDescriptorReadBytes;
extern const Event Seek;
}
@ -63,7 +64,10 @@ bool ReadBufferFromFileDescriptor::nextImpl()
break;
if (-1 == res && errno != EINTR)
{
ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadFailed);
throwFromErrno("Cannot read from file " + getFileName(), ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR);
}
if (res > 0)
bytes_read += res;

2
dbms/src/IO/WriteBufferAIO.cpp
View File

@ -9,6 +9,7 @@
namespace ProfileEvents
{
extern const Event FileOpen;
extern const Event FileOpenFailed;
extern const Event WriteBufferAIOWrite;
extern const Event WriteBufferAIOWriteBytes;
}
@ -58,6 +59,7 @@ WriteBufferAIO::WriteBufferAIO(const std::string & filename_, size_t buffer_size
fd = ::open(filename.c_str(), open_flags, mode_);
if (fd == -1)
{
ProfileEvents::increment(ProfileEvents::FileOpenFailed);
auto error_code = (errno == ENOENT) ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE;
throwFromErrno("Cannot open file " + filename, error_code);
}

13
dbms/src/IO/WriteBufferFromFile.cpp
View File

@ -10,6 +10,7 @@
namespace ProfileEvents
{
extern const Event FileOpen;
extern const Event FileOpenFailed;
}
namespace DB
@ -44,13 +45,21 @@ WriteBufferFromFile::WriteBufferFromFile(
fd = open(file_name.c_str(), flags == -1 ? O_WRONLY | O_TRUNC | O_CREAT : flags, mode);
if (-1 == fd)
{
ProfileEvents::increment(ProfileEvents::FileOpenFailed);
throwFromErrno("Cannot open file " + file_name, errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
}
#ifdef __APPLE__
if (o_direct)
if (fcntl(fd, F_NOCACHE, 1) == -1)
{
if (fcntl(fd, F_NOCACHE, 1) == -1)
{
ProfileEvents::increment(ProfileEvents::FileOpenFailed);
throwFromErrno("Cannot set F_NOCACHE on file " + file_name, ErrorCodes::CANNOT_OPEN_FILE);
#endif
}
}
#endif
}

4
dbms/src/IO/WriteBufferFromFileDescriptor.cpp
View File

@ -12,6 +12,7 @@
namespace ProfileEvents
{
extern const Event WriteBufferFromFileDescriptorWrite;
extern const Event WriteBufferFromFileDescriptorWriteFailed;
extern const Event WriteBufferFromFileDescriptorWriteBytes;
}
@ -49,7 +50,10 @@ void WriteBufferFromFileDescriptor::nextImpl()
}
if ((-1 == res || 0 == res) && errno != EINTR)
{
ProfileEvents::increment(ProfileEvents::WriteBufferFromFileDescriptorWriteFailed);
throwFromErrno("Cannot write to file " + getFileName(), ErrorCodes::CANNOT_WRITE_TO_FILE_DESCRIPTOR);
}
if (res > 0)
bytes_written += res;