Actions:
|
2012-05-31 13:39 AEST by Arthur Barrett - I wasn't able to commit (branch CVSNT_BRANCH_2_5_03_2382) after doing a merge
(CVSNT_BRANCH_2_8_01_3761) using build cvsnt-2.8.02.4538. Also tried with
2.5.03.7966
D:\march-hare\certs>cvs ver
Client: Concurrent Versions System (CVSNT) 2.5.03 (Scorpio) Build 7966 (client/s
erver)
Server: Concurrent Versions System (CVSNT) 2.8.02 (Cally) Build 3922 (RC 1) (cli
ent/server)
On commit it just kept hanging. I tried:
* restart server processes
* retry on client
* client trace
:~$ find /tmp/cvs-serv32099 -print | wc -l
390
:~$ du --si --max-depth=0 /tmp/cvs-serv32099
4.3M /tmp/cvs-serv32099
:~$ find /tmp/cvs-serv32099 -path "*/CVS*" -prune -o -type f -print
/tmp/cvs-serv32099/xdiff/ext_xdiff.cpp
/tmp/cvs-serv32099/windows-NT/cvsdiag/cvsdiag.cpp
/tmp/cvs-serv32099/windows-NT/cvsdiag/cvsdiag.vcproj
/tmp/cvs-serv32099/windows-NT/config.h
/tmp/cvs-serv32099/windows-NT/filesubr.cpp
/tmp/cvs-serv32099/windows-NT/setuid.cpp
/tmp/cvs-serv32099/windows-NT/win32.cpp
/tmp/cvs-serv32099/triggers/audit_trigger.cpp
/tmp/cvs-serv32099/src/client.cpp
/tmp/cvs-serv32099/src/commit.cpp
/tmp/cvs-serv32099/src/cvs.h
/tmp/cvs-serv32099/src/edit.cpp
/tmp/cvs-serv32099/src/fileattr.cpp
/tmp/cvs-serv32099/src/fileattr.h
/tmp/cvs-serv32099/src/hash.cpp
/tmp/cvs-serv32099/src/log.cpp
/tmp/cvs-serv32099/src/main.cpp
/tmp/cvs-serv32099/src/mapping.cpp
/tmp/cvs-serv32099/src/rcs.cpp
/tmp/cvs-serv32099/src/rename.cpp
/tmp/cvs-serv32099/src/server.cpp
/tmp/cvs-serv32099/src/subr.cpp
/tmp/cvs-serv32099/src/vers_ts.cpp
/tmp/cvs-serv32099/simcvs/simcpl.cpp
/tmp/cvs-serv32099/simcvs/res/simcpl.manifest
/tmp/cvs-serv32099/redhat/build
/tmp/cvs-serv32099/protocols/enum_protocol.vcproj
/tmp/cvs-serv32099/protocols/ext_protocol.vcproj
/tmp/cvs-serv32099/protocols/fork_protocol.vcproj
/tmp/cvs-serv32099/protocols/sserver_protocol.vcproj
/tmp/cvs-serv32099/protocols/ssh_protocol.vcproj
/tmp/cvs-serv32099/protocols/sync_protocol.vcproj
/tmp/cvs-serv32099/lockservice/lockservice.cpp
/tmp/cvs-serv32099/lockservice/server.cpp
/tmp/cvs-serv32099/installer/cvs-suite-installer.wxs
/tmp/cvs-serv32099/installer/makefile
/tmp/cvs-serv32099/installer/server.wxs
/tmp/cvs-serv32099/installer/tortoisecvs.wxs
/tmp/cvs-serv32099/installer/ui.wxs
/tmp/cvs-serv32099/installer/winmerge.wxs
/tmp/cvs-serv32099/doc/cvs.dbk
/tmp/cvs-serv32099/cvstools/win32/GlobalSettings.cpp
/tmp/cvs-serv32099/cvstools/win32/InfoPanel.cpp
/tmp/cvs-serv32099/cvstools/win32/InfoPanel.h
/tmp/cvs-serv32099/cvstools/RootSplitter.cpp
/tmp/cvs-serv32099/cvstools/RootSplitter.h
/tmp/cvs-serv32099/cvstools/ServerConnection.cpp
/tmp/cvs-serv32099/cvstools/ServerConnection.h
/tmp/cvs-serv32099/cvstools/ServerInfo.cpp
/tmp/cvs-serv32099/cvsntcpl/cvsntcpl.rc
/tmp/cvs-serv32099/cvsntcpl/res/cvsntcpl.manifest
/tmp/cvs-serv32099/cvsapi/Codepage.cpp
/tmp/cvs-serv32099/cvsapi/ServerIO.cpp
/tmp/cvs-serv32099/cvsapi/ServerIO.h
/tmp/cvs-serv32099/cvsapi/win32/SocketIO.cpp
/tmp/cvs-serv32099/cvsagent/win32/cvsagent.cpp
The actual upload of files appears to be complete...
It always 'hangs' on the same point:
cvs ci -B 6216 -m "Bug6216: Merge CVS Suite 2009 R2 fixes into CVS Suite 2010."
10:56:52: -> send_to_server_untranslated() calls buf_output() len=3 nbytes=101
89
10:56:52: -> client_buffer_output()
10:56:52: -> tcp_write(241,768)
10:56:52: -> client_buffer_output()
10:56:52: -> tcp_write(5120,768)
10:56:52: -> client_buffer_output()
10:56:52: -> tcp_write(4831,768)
10:56:52: -> tcp_read(4147) using WSAEventSelect
10:56:52: -> tcp_read(4147) immediate timeout previous thread count -1/0
10:56:52: -> Transcode M ? zlib/win32/Release
10:56:52: -> Transcode returned M ? zlib/win32/Release
10:56:52: -> Transcode M ? xdiff/Release
10:56:52: -> Transcode returned M ? xdiff/Release
10:56:52: -> Transcode M ? windows-NT/setuid/setuid/Release
10:56:52: -> Transcode returned M ? windows-NT/setuid/setuid/Release
.
.
.
10:56:52: -> Transcode returned M ? cvsntcpl/Release
10:56:52: -> Transcode M ? cvsgui/Release
10:56:52: -> Transcode returned M ? cvsgui/Release
10:56:52: -> Transcode M ? cvsdelta/Release
10:56:52: -> Transcode returned M ? cvsdelta/Release
10:56:52: -> Transcode M ? cvsapi/apiloader/Release
10:56:52: -> Transcode returned M ? cvsapi/apiloader/Release
10:56:52: -> Transcode M ? cvsapi/ServiceMsg.rc
10:56:52: -> Transcode returned M ? cvsapi/ServiceMsg.rc
10:56:52: -> Transcode M ? cvsapi/ServiceMsg.h
10:56:52: -> Transcode returned M ? cvsapi/ServiceMsg.h
10:56:52: -> Transcode M ? cvsapi/Release
10:56:52: -> Transcode returned M ? cvsapi/Release
10:56:52: -> Transcode M ? cvsapi/MSG00001.bin
10:56:52: -> Transcode returned M ? cvsapi/MSG00001.bin
10:56:52: -> Transcode M ? cvsagent/win32/Release
10:56:52: -> Transcode returned M ? cvsagent/win32/Release
10:56:52: -> Transcode M ? control-panel/Release
10:56:52: -> Transcode returned M ? control-panel/Release
10:56:52: -> Transcode M ? WorkspaceViewer/Release
10:56:52: -> Transcode returned M ? WorkspaceViewer/Release
10:56:52: -> Transcode M ? {TARGET}
10:56:52: -> Transcode returned M ? {TARGET}
10:56:52: -> Transcode M ? batch_merge.bat
10:56:52: -> Transcode returned M ? batch_merge.bat
10:56:52: -> tcp_read(1272) using WSAEventSelect |
|
2012-05-31 13:48 AEST by Arthur Barrett - When the sync master is unavailable the client is never notified because the
sync client (cache server) successfully fulfills most requests (merge, update,
diff etc.).
When the commit fails to contact the host server, cache server should either
time out with some meaningful message, or give some other feedback as to the
cause of the 'hang'. |