diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index eaeaa5c4cf96e60b3d444fbf9815d42aa351ac7a..c100d1b9b80dc2e4ad375618b8292bddaab2ec26 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
CHANGELOG for smartmontools
-$Id: CHANGELOG,v 1.59 2002/11/25 08:43:23 ballen4705 Exp $
+$Id: CHANGELOG,v 1.60 2002/11/27 13:58:30 ballen4705 Exp $
Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
@@ -31,6 +31,14 @@ NOTES FOR FUTURE RELEASES: see TODO file.
CURRENT RELEASE (see VERSION file in this directory):
+ [BA] smartctl: The -O option to enable an Immediate off-line test
+ did not print out the correct time that the test would take to
+ complete. This is because the test timer is volatile and not
+ fixed. This has been fixed, and the smartctl.8 man page has been
+ updated to explain how to track the Immediate offline test as it
+ progresses, and to further emphasize the differences between the
+ off-line immediate test and the self-tests.
+
[BA] smartctl: modified so that arguments could have either a single -
as in -ea or multiple ones as in -e -a. Improved warning message for
device not opened, and fixed error in redirection of error output of
diff --git a/sm5/ataprint.c b/sm5/ataprint.c
index 08e02549c0344b213b942705d02d7e2be25bb23c..d131a4af91c1907a37bb93f3d2ac86e52ed5f474 100644
--- a/sm5/ataprint.c
+++ b/sm5/ataprint.c
@@ -30,7 +30,7 @@
#include "smartctl.h"
#include "extern.h"
-const char *CVSid2="$Id: ataprint.c,v 1.45 2002/11/22 16:26:46 ballen4705 Exp $"
+const char *CVSid2="$Id: ataprint.c,v 1.46 2002/11/27 13:58:30 ballen4705 Exp $"
CVSID1 CVSID2 CVSID3 CVSID6;
// for passing global control variables
@@ -1003,14 +1003,35 @@ int ataPrintMain (int fd){
pout("Warning: device does not support Self-Test functions.\n\n");
failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
}
- // Now do the test
+ // Now do the test. Note ataSmartTest prints its own error/success
+ // messages
if (ataSmartTest(fd, con->testcase))
failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
- // Tell user how long test will take to complete
+ // Tell user how long test will take to complete. This is tricky
+ // because in the case of an Offline Full Scan, the completion timer
+ // is volatile, and needs to be read AFTER the command is
+ // given. [This is NOT the case for the self-test times which are
+ // FIXED not volatile.] Since the data is in the Device SMART data
+ // structure, we need to give a SMART read data command to retrieve
+ // this. However, in some cases the SMART read data command will
+ // interrupt the Offline Full Scan. So...
+ if (con->testcase==OFFLINE_FULL_SCAN){
+ // get the data that we need
+ if (ataReadSmartValues(fd, &smartval)){
+ pout("Smartctl: SMART Read Values failed.\n");
+ failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
+ }
+ // then restart the command if getting the data aborted it
+ if (isSupportOfflineAbort(&smartval) && ataSmartTest(fd, con->testcase))
+ failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
+ }
+
+ // Now find out how long the test will take to complete, and tell
+ // the poor user.
if ((timewait=TestTime(&smartval,con->testcase))){
pout("Please wait %d %s for test to complete.\n",
- (int)timewait, con->testcase==OFFLINE_FULL_SCAN?"seconds":"minutes");
+ (int)timewait, con->testcase==OFFLINE_FULL_SCAN?"seconds":"minutes");
if (con->testcase!=SHORT_CAPTIVE_SELF_TEST && con->testcase!=EXTEND_CAPTIVE_SELF_TEST)
pout("Use smartctl -%c to abort test.\n", (int)SMARTSELFTESTABORT);
diff --git a/sm5/ataprint.cpp b/sm5/ataprint.cpp
index e15b5240315311423f463c12f69de620c14f5a1d..19deb1e3f0694bc0e0b3fbd6b91ede58a1b07cd3 100644
--- a/sm5/ataprint.cpp
+++ b/sm5/ataprint.cpp
@@ -30,7 +30,7 @@
#include "smartctl.h"
#include "extern.h"
-const char *CVSid2="$Id: ataprint.cpp,v 1.45 2002/11/22 16:26:46 ballen4705 Exp $"
+const char *CVSid2="$Id: ataprint.cpp,v 1.46 2002/11/27 13:58:30 ballen4705 Exp $"
CVSID1 CVSID2 CVSID3 CVSID6;
// for passing global control variables
@@ -1003,14 +1003,35 @@ int ataPrintMain (int fd){
pout("Warning: device does not support Self-Test functions.\n\n");
failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
}
- // Now do the test
+ // Now do the test. Note ataSmartTest prints its own error/success
+ // messages
if (ataSmartTest(fd, con->testcase))
failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
- // Tell user how long test will take to complete
+ // Tell user how long test will take to complete. This is tricky
+ // because in the case of an Offline Full Scan, the completion timer
+ // is volatile, and needs to be read AFTER the command is
+ // given. [This is NOT the case for the self-test times which are
+ // FIXED not volatile.] Since the data is in the Device SMART data
+ // structure, we need to give a SMART read data command to retrieve
+ // this. However, in some cases the SMART read data command will
+ // interrupt the Offline Full Scan. So...
+ if (con->testcase==OFFLINE_FULL_SCAN){
+ // get the data that we need
+ if (ataReadSmartValues(fd, &smartval)){
+ pout("Smartctl: SMART Read Values failed.\n");
+ failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
+ }
+ // then restart the command if getting the data aborted it
+ if (isSupportOfflineAbort(&smartval) && ataSmartTest(fd, con->testcase))
+ failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
+ }
+
+ // Now find out how long the test will take to complete, and tell
+ // the poor user.
if ((timewait=TestTime(&smartval,con->testcase))){
pout("Please wait %d %s for test to complete.\n",
- (int)timewait, con->testcase==OFFLINE_FULL_SCAN?"seconds":"minutes");
+ (int)timewait, con->testcase==OFFLINE_FULL_SCAN?"seconds":"minutes");
if (con->testcase!=SHORT_CAPTIVE_SELF_TEST && con->testcase!=EXTEND_CAPTIVE_SELF_TEST)
pout("Use smartctl -%c to abort test.\n", (int)SMARTSELFTESTABORT);
diff --git a/sm5/smartctl.8 b/sm5/smartctl.8
index 2d2c40de21ac108ac82fb779277bbf16a17b5e12..cdce96cfa29384517d491e8c7aff223a415664c8 100644
--- a/sm5/smartctl.8
+++ b/sm5/smartctl.8
@@ -1,6 +1,6 @@
\# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
\#
-\# $Id: smartctl.8,v 1.28 2002/11/25 08:40:48 ballen4705 Exp $
+\# $Id: smartctl.8,v 1.29 2002/11/27 13:58:30 ballen4705 Exp $
\#
\# This program is free software; you can redistribute it and/or modify it
\# under the terms of the GNU General Public License as published by the Free
@@ -16,7 +16,7 @@
\# Research Center), Jack Baskin School of Engineering, University of
\# California, Santa Cruz. http://ssrc.soe.ucsc.edu/
\#
-.TH SMARTCTL 8 "$Date: 2002/11/25 08:40:48 $" "smartmontools-5.0"
+.TH SMARTCTL 8 "$Date: 2002/11/27 13:58:30 $" "smartmontools-5.0"
.SH NAME
smartctl \- S.M.A.R.T. control and monitor utility
.SH SYNOPSIS
@@ -197,11 +197,16 @@ Published Disk Specifications. For example the IBM Travelstar 40GNX
Hard Disk Drive Specifications (Revision 1.1, 22 April 2002,
Publication # 1541, Document S07N-7715-02) page 164.]
-S.M.A.R.T. provides three basic categories of testing. The first
-category, called 'online' testing, has no effect on the performance of
+S.M.A.R.T. provides
+.B three basic categories of testing.
+The
+.B first category,
+called 'online' testing, has no effect on the performance of
the device. It is turned on by the '\-e' option.
-The second category of testing is called 'offline' testing. This type
+The
+.B second category of testing
+is called 'offline' testing. This type
of test can, in principle, degrade the device performance. The '\-t'
option causes this offline testing to be carried out, automatically,
on a regular scheduled basis. Normally, the disk will suspend any
@@ -216,19 +221,28 @@ Any errors detected in automatic or immediate offline testing will be
shown in the S.M.A.R.T. error log, and will be reflected in the values
of the S.M.A.R.T. attributes. These are visible with the '\-l' and '\-v' options.
-The third class of testing is the 'self' testing. This third type of
+The
+.B third category of testing
+is the 'self' testing. This third type of
test is only performed (immediately) when a command to run it is
issued. The '\-S', '\-s', '\-X', '\-x', and '\-A' options below can
be used to carry out (and abort) such self-tests; please see below for further
details.
-Any errors detected in the self testign will be shown in the
+Any errors detected in the self testing will be shown in the
S.M.A.R.T. self-test log, which can be examined using the '\-L'
option.
+.B Note:
+in this manual page, the word
+.B "Test"
+is used in connection with the second category
+just described, e.g. for the 'offline' testing. The words
+.B "Self-test"
+are used in connection with the third category.
.TP
.B \-T
-unTest: Disables S.M.A.R.T. automatic offline test timer.
+unTest: Disables S.M.A.R.T. automatic offline test timer.
.TP
.B \-f
File: Enables S.M.A.R.T. autosave of device vendor-specific
@@ -257,12 +271,21 @@ this happens, use the '\-a' option to get more information, and
.B get your data off the disk and someplace safe as soon as you can.
.TP
.B \-g
-Generic: Prints only the generic S.M.A.R.T. attributes. This shows
-the S.M.A.R.T. capabilities of the device (can it log errors, does it
-support offline surface scanning, and so on). If the device can carry
-out self-tests, it also lists the estimated time required to run those
-tests. See REFERENCES below for further information about their
-meaning.
+Generic: Prints only the generic S.M.A.R.T. capabilities. These show
+what S.M.A.R.T. features are implemented and how the device will
+respond to some of the different S.M.A.R.T. commands. For example it
+shows if the device logs errors, if it support offline surface
+scanning, and so on. If the device can carry out self-tests, this
+option also shows the estimated time required to run those tests.
+
+Note that the time required to run the Self-tests (listed in minutes)
+are fixed. However the time required to run the Immediate Offline
+Test (listed in seconds) is variable. This means that if you issue a
+command to perform an Immediate Offline test with the '\-O' option,
+then the time may jump to a larger value and then count down as the
+Immediate Offline Test is carried out. Please see REFERENCES below
+for further information about the the flags and capabilities described
+by this option.
.TP
.B \-v
Vendor: Prints only the vendor specific S.M.A.R.T. attributes. The
@@ -345,11 +368,22 @@ only a single one of these tests can be run at a time, so no more than one
of the following options should be given on the command line.
.TP
.B \-O
-Offline: Runs S.M.A.R.T. Immediate offline Test. This immediately
+Offline: Runs S.M.A.R.T. Immediate Offline Test. This immediately
starts the test describe above. This command can be given during
normal system operation. The effects of this test are visible only in
that it updates the S.M.A.R.T. attribute values, and if errors are
-found they will appear in the S.M.A.R.T. error log, visible with the '\-l' option.
+found they will appear in the S.M.A.R.T. error log, visible with the '\-l' option.
+
+If the '\-g' option to
+.B smartctl
+shows that the device has the "Suspend Offline collection upon new
+command" capability then you can track the progress of the Immediate Offline
+test using the '\-g' option to
+.B smartctl.
+If the '\-g' option show that the device has the "Abort Offline
+collection upon new command" capability then most commands will abort
+the Immediate Offline Test, so you should not try to track the
+progress of the test with '\-g', as it will abort the test.
.TP
.B \-S
Selftest: Runs S.M.A.R.T. Short Self Test (usually under ten minutes).
@@ -379,7 +413,9 @@ eXtended: Runs the S.M.A.R.T. Extended Self Test just described, in Captive Mode
.B Only run this on drives without any mounted partitions.
.TP
.B \-A
-Abort: Aborts Non-Captive S.M.A.R.T. Self Tests.
+Abort: Aborts Non-Captive S.M.A.R.T. Self Tests. Note that this
+command will abort the Offline Immediate Test routine only if your
+disk has the "Abort Offline collection upon new command" capability.
.PP
.SH EXAMPLES
.nf
@@ -557,4 +593,4 @@ Please let us know if there is an on\-line source for this document.
.SH
CVS ID OF THIS PAGE:
-$Id: smartctl.8,v 1.28 2002/11/25 08:40:48 ballen4705 Exp $
+$Id: smartctl.8,v 1.29 2002/11/27 13:58:30 ballen4705 Exp $