The branch, master has been updated via 096589a... Trying to find out why the posix_unlink test build farm is still failing even though we're now successfully deleting the symlink. Jeremy. via 7c51fa6... Merge branch 'master' of ssh://j...@git.samba.org/data/git/samba via cc3a677... unlink defer torture test from 3e3214f... s3:winbind: Move fillup_pw_field() as static to wb_fill_pwent.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 096589aead97f52b5009970d28a00a6d1a205a7e Author: Jeremy Allison <j...@samba.org> Date: Sat Oct 17 10:38:44 2009 -0700 Trying to find out why the posix_unlink test build farm is still failing even though we're now successfully deleting the symlink. Jeremy. commit 7c51fa6d699a653cafa90df8e44911b576118ebd Merge: cc3a6770c77ec8fe1cd63bf4c682853c56201f0c 3e3214fd91471bca5b6c4d3782e922d252d588fb Author: Jeremy Allison <j...@samba.org> Date: Sat Oct 17 10:36:33 2009 -0700 Merge branch 'master' of ssh://j...@git.samba.org/data/git/samba commit cc3a6770c77ec8fe1cd63bf4c682853c56201f0c Author: Tim Prouty <tpro...@samba.org> Date: Mon Sep 28 10:43:44 2009 -0700 unlink defer torture test ----------------------------------------------------------------------- Summary of changes: source3/script/tests/test_smbclient_s3.sh | 2 +- source4/torture/raw/unlink.c | 100 +++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index f10bfea..3ff9597 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -108,7 +108,7 @@ EOF if [ $ret != 0 ] ; then echo "$out" - echo "failed create then delete bad symlink" + echo "failed create then delete bad symlink with error $ret" false return fi diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index 699bc30..28218b2 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -435,6 +435,105 @@ done: } +struct unlink_defer_cli_state { + struct torture_context *tctx; + struct smbcli_state *cli1; +}; + +/* + * A handler function for oplock break requests. Ack it as a break to none + */ +static bool oplock_handler_ack_to_none(struct smbcli_transport *transport, + uint16_t tid, uint16_t fnum, + uint8_t level, void *private_data) +{ + struct unlink_defer_cli_state *ud_cli_state = + (struct unlink_defer_cli_state *)private_data; + union smb_setfileinfo sfinfo; + NTSTATUS status; + bool ret; + struct smbcli_request *req = NULL; + + torture_comment(ud_cli_state->tctx, "delete the file before sending " + "the ack."); + + /* cli1: set delete on close */ + sfinfo.disposition_info.level = RAW_SFILEINFO_DISPOSITION_INFO; + sfinfo.disposition_info.in.file.fnum = fnum; + sfinfo.disposition_info.in.delete_on_close = 1; + req = smb_raw_setfileinfo_send(ud_cli_state->cli1->tree, &sfinfo); + + smbcli_close(ud_cli_state->cli1->tree, fnum); + + torture_comment(ud_cli_state->tctx, "Acking the oplock to NONE\n"); + + ret = smbcli_oplock_ack(ud_cli_state->cli1->tree, fnum, + OPLOCK_BREAK_TO_NONE); + done: + return ret; +} + +static bool test_unlink_defer(struct torture_context *tctx, + struct smbcli_state *cli1, + struct smbcli_state *cli2) +{ + const char *fname = BASEDIR "\\test_unlink_defer.dat"; + NTSTATUS status; + bool ret = true; + union smb_open io; + union smb_unlink unl; + uint16_t fnum=0; + struct unlink_defer_cli_state ud_cli_state = {}; + + if (!torture_setup_dir(cli1, BASEDIR)) { + return false; + } + + /* cleanup */ + smbcli_unlink(cli1->tree, fname); + + ud_cli_state.tctx = tctx; + ud_cli_state.cli1 = cli1; + + smbcli_oplock_handler(cli1->transport, oplock_handler_ack_to_none, + &ud_cli_state); + + io.generic.level = RAW_OPEN_NTCREATEX; + io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; + io.ntcreatex.in.alloc_size = 0; + io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL; + io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | + NTCREATEX_SHARE_ACCESS_WRITE | + NTCREATEX_SHARE_ACCESS_DELETE; + io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF; + io.ntcreatex.in.create_options = 0; + io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; + io.ntcreatex.in.security_flags = 0; + io.ntcreatex.in.fname = fname; + + /* cli1: open file with a batch oplock. */ + io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED | + NTCREATEX_FLAGS_REQUEST_OPLOCK | + NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK; + + status = smb_raw_open(cli1->tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_OK); + fnum = io.ntcreatex.out.file.fnum; + + /* cli2: Try to unlink it, but block on the oplock */ + torture_comment(tctx, "Try an unlink (should defer the open\n"); + unl.unlink.in.pattern = fname; + unl.unlink.in.attrib = 0; + status = smb_raw_unlink(cli2->tree, &unl); + +done: + smb_raw_exit(cli1->session); + smb_raw_exit(cli2->session); + smbcli_deltree(cli1->tree, BASEDIR); + return ret; +} + /* basic testing of unlink calls */ @@ -444,6 +543,7 @@ struct torture_suite *torture_raw_unlink(TALLOC_CTX *mem_ctx) torture_suite_add_1smb_test(suite, "unlink", test_unlink); torture_suite_add_1smb_test(suite, "delete_on_close", test_delete_on_close); + torture_suite_add_2smb_test(suite, "UNLINK-DEFER", test_unlink_defer); return suite; } -- Samba Shared Repository