ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iscsi: restore data_transferred accumulation for read

Browse Source 
In the patch 393582, by analyzing the code,
accumulation of write completion to bdev was duplicated by
data_transferred and bytes_completed.

Hence accumulation of data_transferred for write was intended
to be removed.

However by mistake accumulation of data_transferred for read
was removed.

In this patch restore accumulation of data_transferred for
read and remove accumlation of data_transferred for write.

Test code to catch this degradation will be added by another
patch soon.

Change-Id: Iea9883e8ef1bfb0bdf00e291712e6faf2fad281f
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/393713
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-01-05 08:58:14 +09:00 committed by Daniel Verkamp
parent c013db36fc
commit 60f1d52605
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/iscsi/conn.c
View File

@ -1070,9 +1070,6 @@ spdk_iscsi_task_cpl(struct spdk_scsi_task *scsi_task)
if (spdk_iscsi_task_is_read(primary)) { if (spdk_iscsi_task_is_read(primary)) {
process_read_task_completion(conn, task, primary); process_read_task_completion(conn, task, primary);
} else { } else {
if (task != primary) {
primary->scsi.data_transferred += task->scsi.data_transferred;
}
primary->bytes_completed += task->scsi.length; primary->bytes_completed += task->scsi.length;
if ((task != primary) && if ((task != primary) &&
(task->scsi.status != SPDK_SCSI_STATUS_GOOD)) { (task->scsi.status != SPDK_SCSI_STATUS_GOOD)) {

3
lib/iscsi/iscsi.c
View File

@ -2834,6 +2834,9 @@ spdk_iscsi_transfer_in(struct spdk_iscsi_conn *conn,
} }
} }
if (task != primary) {
primary->scsi.data_transferred += task->scsi.data_transferred;
}
primary->datain_datasn = DataSN; primary->datain_datasn = DataSN;
if (sent_status) { if (sent_status) {