[refactoring] fix typos

Author: kulaginm

src/utils/file.c

@@ -615,7 +615,7 @@ fio_close(int fd)
 
 		/* Wait for response */
 		IO_CHECK(fio_read_all(fio_stdin, &hdr, sizeof(hdr)), sizeof(hdr));
-		Assert(hdr.arg == FIO_CLOSE);
+		Assert(hdr.cop == FIO_CLOSE);
 
 		if (hdr.arg != 0)
 		{
@@ -831,7 +831,7 @@ fio_write(int fd, void const* buf, size_t size)
 
 		/* check results */
 		IO_CHECK(fio_read_all(fio_stdin, &hdr, sizeof(hdr)), sizeof(hdr));
-		Assert(hdr.arg == FIO_WRITE);
+		Assert(hdr.cop == FIO_WRITE);
 
 		/* set errno */
 		if (hdr.arg > 0)

tests/merge.py

@@ -1191,7 +1191,7 @@ def test_continue_failed_merge_2(self):
 
         gdb = self.merge_backup(backup_dir, "node", backup_id, gdb=True)
 
-        gdb.set_breakpoint('pgFileDelete')
+        gdb.set_breakpoint('fio_remove')
 
         gdb.run_until_break()
 
@@ -1683,7 +1683,7 @@ def test_failed_merge_after_delete(self):
         gdb.set_breakpoint('delete_backup_files')
         gdb.run_until_break()
 
-        gdb.set_breakpoint('pgFileDelete')
+        gdb.set_breakpoint('fio_remove')
         gdb.continue_execution_until_break(20)
 
         gdb._execute('signal SIGKILL')
@@ -1767,7 +1767,7 @@ def test_failed_merge_after_delete_1(self):
 #        gdb.set_breakpoint('parray_bsearch')
 #        gdb.continue_execution_until_break()
 
-        gdb.set_breakpoint('pgFileDelete')
+        gdb.set_breakpoint('fio_remove')
         gdb.continue_execution_until_break(30)
         gdb._execute('signal SIGKILL')
 
@@ -1829,7 +1829,7 @@ def test_failed_merge_after_delete_2(self):
             backup_dir, 'node', page_2, gdb=True,
             options=['--log-level-console=VERBOSE'])
 
-        gdb.set_breakpoint('pgFileDelete')
+        gdb.set_breakpoint('fio_remove')
         gdb.run_until_break()
         gdb.continue_execution_until_break(2)
         gdb._execute('signal SIGKILL')
@@ -1907,7 +1907,7 @@ def test_failed_merge_after_delete_3(self):
         gdb.set_breakpoint('delete_backup_files')
         gdb.run_until_break()
 
-        gdb.set_breakpoint('pgFileDelete')
+        gdb.set_breakpoint('fio_remove')
         gdb.continue_execution_until_break(20)
 
         gdb._execute('signal SIGKILL')