February 2014 - Triton-commits - mailman3.cels.anl.gov

branch, master, updated. ebbd1af8be550a75fae90193bada584660982b5b
by noreply＠mcs.anl.gov 28 Feb '14

28 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via ebbd1af8be550a75fae90193bada584660982b5b (commit) from f1eb4982d6b66dfcfbd112ad0eb88a1f2df99a1c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ebbd1af8be550a75fae90193bada584660982b5b Author: Shane Snyder <ssnyder(a)mcs.anl.gov> Date: Fri Feb 28 16:09:40 2014 -0600 Swim report: More introduction and references ----------------------------------------------------------------------- Summary of changes: reports/triton-swim-report/swim-report.bib | 120 ++++++++++++++++++++++++---- reports/triton-swim-report/swim-report.tex | 75 +++++++++++++++++- 2 files changed, 178 insertions(+), 17 deletions(-) Diff of changes: diff --git a/reports/triton-swim-report/swim-report.bib b/reports/triton-swim-report/swim-report.bib index 89bc107..99adc5d 100644 --- a/reports/triton-swim-report/swim-report.bib +++ b/reports/triton-swim-report/swim-report.bib @@ -1,20 +1,110 @@ @inproceedings{Gupta:2001, - author = {Gupta, Indranil and Chandra, Tushar D. and Goldszmidt, Germ\'{a}n S.}, - title = {On Scalable and Efficient Distributed Failure Detectors}, - booktitle = {Proceedings of the Twentieth Annual ACM Symposium on Principles of Distributed Computing}, - series = {PODC '01}, - year = {2001}, - isbn = {1-58113-383-9}, - location = {Newport, Rhode Island, USA}, - pages = {170--179}, - numpages = {10}, - url = {http://doi.acm.org/10.1145/383962.384010}, - doi = {10.1145/383962.384010}, - acmid = {384010}, - publisher = {ACM}, - address = {New York, NY, USA}, - keywords = {accuracy, distributed systems, efficiency, failure detectors, scalability}, + AUTHOR = "Indranil Gupta and Tushar D. Chandra and Germ\'{a}n S. Goldszmidt", + TITLE = "On Scalable and Efficient Distributed Failure Detectors", + BOOKTITLE = "Proceedings of the Twentieth Annual ACM Symposium on Principles of Distributed Computing", + SERIES = "PODC '01", + YEAR = "2001", + LOCATION = "Newport, Rhode Island, USA", + PAGES = "170-179", + URL = "http://doi.acm.org/10.1145/383962.384010", + PUBLISHER = "ACM Press", + ADDRESS = "New York, NY, USA", } +@inproceedings{Das:2002, + AUTHOR = "Abhinandan Das and Indranil Gupta and Ashish Motivala", + TITLE = "SWIM: Scalable Weakly-consistent Infection-style Process Group Membership Protocol", + BOOKTITLE = "Proceedings of the 2002 International Conference on Dependable Systems and Networks", + SERIES = "DSN '02", + YEAR = "2002", + LOCATION = "Washington, DC, USA", + PAGES = "303-312", + URL = "http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=1028914", + PUBLISHER = "IEEE Computer Society Press", + ADDRESS = "Washington, DC, USA", +} + +@incollection{Renesse:1998, + AUTHOR = "Robbert van Renesse and Yaron Minsky and Mark Hayden", + TITLE = "A Gossip-Style Failure Detection Service", + booktitle = "Proceedings of Middleware '98", + YEAR = "1998", + PAGES = "55-70", + URL = "http://link.springer.com/chapter/10.1007/978-1-4471-1283-9_4", + EDITOR = "Nigel Davies and Seitz Jochen and Kerry Raymond", + PUBLISHER = "Springer London", +} + +@inproceedings{Weil:2006, + AUTHOR = "Sage A. Weil and Scott A. Brandt and Ethan L. Miller and Darrell D. E. Long and Carlos Maltzahn", + TITLE = "Ceph: A Scalable, High-performance Distributed File System", + BOOKTITLE = "Proceedings of the 7th Symposium on Operating Systems Design and Implementation", + SERIES = "OSDI '06", + YEAR = "2006", + LOCATION = "Seattle, Washington, USA", + PAGES = "307-320", + URL = "http://dl.acm.org/citation.cfm?id=1298485", + PUBLISHER = "USENIX Association", + ADDRESS = "Berkeley, CA, USA", +} + +@article{Lakshman:2010, + AUTHOR = "Avinash Lakshman and Prashant Malik", + TITLE = "Cassandra: A Decentralized Structured Storage System", + JOURNAL = "SIGOPS Operating System Review", + ISSUE_DATE = "April 2010", + VOLUME = "44", + NUMBER = "2", + MONTH = "Apr.", + YEAR = "2010", + PAGES = "35-40", + URL = "http://doi.acm.org/10.1145/1773912.1773922", + PUBLISHER = "ACM Press", + ADDRESS = "New York, NY, USA", +} + +@article{Birman:1993, + AUTHOR = "Kenneth P. Birman", + TITLE = "The Process Group Approach to Reliable Distributed Computing", + JOURNAL = "Communications of the ACM", + ISSUE_DATE = "Dec. 1993", + VOLUME = "36", + NUMBER = "12", + MONTH = "Dec.", + YEAR = "1993", + PAGES = "37-53", + URL = "http://doi.acm.org/10.1145/163298.163303", + PUBLISHER = "ACM Press", + ADDRESS = "New York, NY, USA", +} + +@article{Birman:1999, + AUTHOR = "Kenneth P. Birman and Mark Hayden and Oznur Ozkasap and Zhen Xiao and Mihai Budiu and Yaron Minsky", + TITLE = "Bimodal Multicast", + JOURNAL = "ACM Transactions on Computer Systems", + ISSUE_DATE = "May 1999", + VOLUME = "17", + NUMBER = "2", + MONTH = "May", + YEAR = "1999", + PAGES = "41-88", + URL = "http://doi.acm.org/10.1145/312203.312207", + PUBLISHER = "ACM Press", + ADDRESS = "New York, NY, USA", +} +@article{Chandra:1996, + AUTHOR = "Tushar Deepak Chandra and Sam Toueg", + TITLE = "Unreliable Failure Detectors for Reliable Distributed Systems", + JOURNAL = "Journal of the ACM", + ISSUE_DATE = "March 1996", + VOLUME = "43", + NUMBER = "2", + MONTH = "Mar.", + YEAR = "1996", + PAGES = "225-267", + URL = "http://doi.acm.org/10.1145/226643.226647", + PUBLISHER = "ACM Press", + ADDRESS = "New York, NY, USA", +} diff --git a/reports/triton-swim-report/swim-report.tex b/reports/triton-swim-report/swim-report.tex index 436f790..d1e3a5c 100644 --- a/reports/triton-swim-report/swim-report.tex +++ b/reports/triton-swim-report/swim-report.tex @@ -103,7 +103,9 @@ %%%%%%%%%%%%%% %% Abstract %% %%%%%%%%%%%%%% -\abstract{} +\abstract{This work analyzes the SWIM protocol, a scalable failure + detection protocol used in numerous distributed and peer-to-peer + applications.} %%%%%%%%%%%%%%%%%% @@ -111,16 +113,85 @@ %%%%%%%%%%%%%%%%%% \section{Introduction} -This is a sample citation~\cite{Gupta:2001}. +There exists numerous distributed software services which require the +maintenance of a consistent process group membership list to reach a +consensus on global system state. Some example services include +distributed storage systems~\cite{Weil:2006,Lakshman:2010} and +reliable mutlicast protocols~\cite{Birman:1993,Birman:1999}. These +services rely heavily on the availability of a failure detection +mechanism in order to transparently respond to node failures, both +transient and permanent. This problem is further complicated by the +rapidly increasing scale of distributed computer systems, where +hardware failures have become the norm instead of the exception. + +%% Should we describe group membership protocols in general here? +For example a distributed storage system might use the group +membership list for determining what nodes are available for placing +replication data on. Similarly, a multicast protocol would use the +membership list to determine which nodes to include in the multicast +of a packet. + +%% Should we talk a little about traditional protocols here, like heart-beating? + +Unfortunately, the scalability of traditional group membership +subsystems (such as heartbeating protocols) has proven unacceptable +for group sizes exceeding more than a few hundred +nodes~\cite{Birman:1999}, precluding their deployment in massively +distributed computer systems. Often, this unscalability arises from +the large network loads imposed by group membership protocols to offer +complete and efficient detection of node failures~\cite{Gupta:2001}. +In this context, ``completeness'' refers to the guarantee that a node +failure will \emph{eventually} be detected at all non-faulty nodes, +and ``efficiency'' implies that a failure will be detected quickly and +with \emph{minimal} probability of producing a false-positive. It has +been previously shown in \cite{Chandra:1996} that a failure detector can not +possibly be both complete and totally accurate, due to the +asynchronous, lossy nature of most computer networks. Specifically, in +an asynchronous networking environment, it is impossible to discern a +failed process from a process that is simply slow. For this reason, +it is typical of most failure detector implementations to guarantee +completeness deterministically but only guarantee accuracy +probabilistically. + +%% We should probably talk briefly about gossip protocols here +In this report, we analyze the of the SWIM protocol, a gossip-based +group membership protocol. More importantly, we consider the +protocol's performance as a component in a large-scale distributed +storage system. + +% TODO update when we have a better idea of the organization/content +The rest of this paper is organized as follows: +Section~\ref{sec:background} summarizes some of the previous work in +the area of distributed failure detectors. In +Section~\ref{sec:methodology}, we describe our methodology for +analyzing the SWIM protocol in the context of the Triton storage +system. Section~\ref{sec:results} presents the experimental results +from our simulation tests. Finally, in Section~\ref{sec:conclusions}, +we conclude with our findings and avenues for future research. %% Background %% \section{Background} +\label{sec:background} + +%% SWIM Design %% +%%\section{Swim Design} +%%\label{sec:swim-design} + +%% Methodology %% +\section{Methodology} +\label{sec:methodology} + +We start with analyzing simulations of the SWIM protocol and +comparing the obtained results with the expected results, according +to the findings in \cite{Gupta:2001}. %% Results %% \section{Results} +\label{sec:results} %% Conclusion %% \section{Conclusion} +\label{sec:conclusions} %%%%%%%%%%%%%%%% %% References %% hooks/post-receive --

1 0

branch, master, updated. f1eb4982d6b66dfcfbd112ad0eb88a1f2df99a1c
by noreply＠mcs.anl.gov 20 Feb '14

20 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via f1eb4982d6b66dfcfbd112ad0eb88a1f2df99a1c (commit) from 3c7bfc241ca3f52df353b1eda97c5dfcc7e7c230 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f1eb4982d6b66dfcfbd112ad0eb88a1f2df99a1c Author: Shane Snyder <ssnyder(a)mcs.anl.gov> Date: Thu Feb 20 17:02:01 2014 -0600 Update SWIM report skeleton and build ----------------------------------------------------------------------- Summary of changes: reports/triton-swim-report/Makefile | 10 ++ .../images/ANL_logo.jpg | Bin 256534 -> 256534 bytes reports/triton-swim-report/swim-report.bib | 20 ++++ reports/triton-swim-report/swim-report.tex | 109 ++++++++++++++++++++ 4 files changed, 139 insertions(+), 0 deletions(-) create mode 100644 reports/triton-swim-report/Makefile copy reports/{triton-techreport => triton-swim-report}/images/ANL_logo.jpg (100%) create mode 100644 reports/triton-swim-report/swim-report.bib Diff of changes: diff --git a/reports/triton-swim-report/Makefile b/reports/triton-swim-report/Makefile new file mode 100644 index 0000000..817c966 --- /dev/null +++ b/reports/triton-swim-report/Makefile @@ -0,0 +1,10 @@ +PDFS := swim-report.pdf + +swim-report.pdf: swim-report.tex swim-report.bib + pdflatex $< + bibtex swim-report + pdflatex $< + pdflatex $< + +clean:: + rm -f $(PDFS) *.aux *.bbl *.toc *.log *.blg *.out diff --git a/reports/triton-swim-report/swim-report.bib b/reports/triton-swim-report/swim-report.bib new file mode 100644 index 0000000..89bc107 --- /dev/null +++ b/reports/triton-swim-report/swim-report.bib @@ -0,0 +1,20 @@ + +@inproceedings{Gupta:2001, + author = {Gupta, Indranil and Chandra, Tushar D. and Goldszmidt, Germ\'{a}n S.}, + title = {On Scalable and Efficient Distributed Failure Detectors}, + booktitle = {Proceedings of the Twentieth Annual ACM Symposium on Principles of Distributed Computing}, + series = {PODC '01}, + year = {2001}, + isbn = {1-58113-383-9}, + location = {Newport, Rhode Island, USA}, + pages = {170--179}, + numpages = {10}, + url = {http://doi.acm.org/10.1145/383962.384010}, + doi = {10.1145/383962.384010}, + acmid = {384010}, + publisher = {ACM}, + address = {New York, NY, USA}, + keywords = {accuracy, distributed systems, efficiency, failure detectors, scalability}, +} + + diff --git a/reports/triton-swim-report/swim-report.tex b/reports/triton-swim-report/swim-report.tex index 9ba30f8..436f790 100644 --- a/reports/triton-swim-report/swim-report.tex +++ b/reports/triton-swim-report/swim-report.tex @@ -4,8 +4,102 @@ \documentclass[12pt,a4paper]{article} +% Packages +\usepackage{natbib} +\usepackage{amsmath} +\usepackage{graphicx} +\usepackage{fancyhdr} +\usepackage{lastpage} +\usepackage{url} +\usepackage{listings} +\usepackage{color} +\usepackage{xcolor} +\usepackage{geometry} +\usepackage{textcomp} +\usepackage{epstopdf} +\usepackage[firstpage]{draftwatermark} +\usepackage[pdftex, + pdftitle={SWIM Report: Triton}, + pdfkeywords={triton,failure detector,gossip protocol}, + pdfauthor={MCS, Argonne National Laboratory}]{hyperref} + +\hypersetup{ + colorlinks = true, + urlcolor = blue, + linkcolor = blue, + citecolor = red, +} + +% Increase Draft watermark size +\SetWatermarkScale{4} + +% Additional settings +\setlength{\textwidth}{420pt} +\setlength{\oddsidemargin}{15pt} +\setlength{\evensidemargin}{15pt} + +% Title page color +\definecolor{titlepagecolor}{cmyk}{0,0,0,0} +\definecolor{myred}{RGB}{217,0,21} +\definecolor{defaulttextcolor}{RGB}{0,0,0} + +\title{SWIM Report: Triton} +\date{March 2014} + \begin{document} +%% TITLE PAGE %% +\begin{titlepage} +\newgeometry{left=5.5cm} %defines the geometry for the titlepage +\pagecolor{titlepagecolor} +\hskip 0.6\textwidth \includegraphics[width=6cm]{images/ANL_logo.jpg}\\ +\color{myred} +\makebox[0pt][l]{\rule{1.3\textwidth}{1pt}} +\par +\noindent +\textcolor{defaulttextcolor}{\textsf{SWIM Report}} +\\ +\\ +{\huge \textbf{\textsf{Triton}}} +\vfill +\noindent +\textcolor{defaulttextcolor} +{\textsf{March 2014}} +\vskip 30pt +\noindent +\textcolor{myred} +{\textsf{Mathematics and Computer Science Division}}\\ +\textcolor{myred} +{\textsf{Argonne National Laboratory}}\\ +\textcolor{myred} +{\textsf{9700 S Cass Avenue, Argonne, IL 60439}}\\ +\vskip\baselineskip +\noindent +\end{titlepage} +\restoregeometry +\nopagecolor + +\newpage + +% TABLE OF CONTENTS +\tableofcontents +\thispagestyle{empty} + +\newpage + +% Set header and footer +\pagestyle{fancy} +\renewcommand{\headrulewidth}{0.4pt} +\renewcommand{\footrulewidth}{0.4pt} +\lhead{} +\rhead{\thepage\ / \pageref{LastPage}} +\cfoot{} +\rfoot{March 2014} +\lfoot{\textcopyright\ Argonne National Laboratory} + +\setcounter{page}{1} +\pagenumbering{arabic} + %%%%%%%%%%%%%% %% Abstract %% %%%%%%%%%%%%%% @@ -17,6 +111,7 @@ %%%%%%%%%%%%%%%%%% \section{Introduction} +This is a sample citation~\cite{Gupta:2001}. %% Background %% \section{Background} @@ -27,4 +122,18 @@ %% Conclusion %% \section{Conclusion} +%%%%%%%%%%%%%%%% +%% References %% +%%%%%%%%%%%%%%%% +\clearpage +\bibliographystyle{unsrt} +\bibliography{swim-report} + +%%%%%%%%%%%%%%%%%%%%% +%% Acknowledgement %% +%%%%%%%%%%%%%%%%%%%%% +\clearpage +\section*{Acknowledgement} + + \end{document} hooks/post-receive --

1 0

branch, master, updated. 3c7bfc241ca3f52df353b1eda97c5dfcc7e7c230
by noreply＠mcs.anl.gov 17 Feb '14

17 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 3c7bfc241ca3f52df353b1eda97c5dfcc7e7c230 (commit) from 3ce52698cc2549393eb8d2506b5c94ceb24b52d7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3c7bfc241ca3f52df353b1eda97c5dfcc7e7c230 Author: Shane Snyder <ssnyder(a)mcs.anl.gov> Date: Mon Feb 17 09:54:30 2014 -0600 Add minimal swim report skeleton to reports dir ----------------------------------------------------------------------- Summary of changes: reports/triton-swim-report/swim-report.tex | 30 ++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 reports/triton-swim-report/swim-report.tex Diff of changes: diff --git a/reports/triton-swim-report/swim-report.tex b/reports/triton-swim-report/swim-report.tex new file mode 100644 index 0000000..9ba30f8 --- /dev/null +++ b/reports/triton-swim-report/swim-report.tex @@ -0,0 +1,30 @@ +%%%%%%%%%%%%%%%%%%%%%%%% +%% Triton Swim Report %% +%%%%%%%%%%%%%%%%%%%%%%%% + +\documentclass[12pt,a4paper]{article} + +\begin{document} + +%%%%%%%%%%%%%% +%% Abstract %% +%%%%%%%%%%%%%% +\abstract{} + + +%%%%%%%%%%%%%%%%%% +%% Introduction %% +%%%%%%%%%%%%%%%%%% +\section{Introduction} + + +%% Background %% +\section{Background} + +%% Results %% +\section{Results} + +%% Conclusion %% +\section{Conclusion} + +\end{document} hooks/post-receive --

1 0

branch, master, updated. c48e399d100ed06f15f96cb15592608e773ee67b
by noreply＠mcs.anl.gov 12 Feb '14

12 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via c48e399d100ed06f15f96cb15592608e773ee67b (commit) from 46f94887960e347867b06f88f89362c4428eb627 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c48e399d100ed06f15f96cb15592608e773ee67b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Feb 12 21:47:48 2014 -0500 const fix ----------------------------------------------------------------------- Summary of changes: code/src/system-state/system-state-engine.ae | 2 +- code/src/system-state/system-state-engine.hae | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/system-state/system-state-engine.ae b/code/src/system-state/system-state-engine.ae index 09e112b..96c04da 100644 --- a/code/src/system-state/system-state-engine.ae +++ b/code/src/system-state/system-state-engine.ae @@ -67,7 +67,7 @@ void triton_rpc_system_state_engine_register(void) } -__blocking triton_ret_t remote_triton_rpc_system_state_put(na_addr_t addr, triton_node_t node, char* key, char* val) +__blocking triton_ret_t remote_triton_rpc_system_state_put(na_addr_t addr, triton_node_t node, const char* key, char* val) { triton_rpc_system_state_put_out_t out; triton_rpc_system_state_put_in_t in; diff --git a/code/src/system-state/system-state-engine.hae b/code/src/system-state/system-state-engine.hae index efe34c4..38db60d 100644 --- a/code/src/system-state/system-state-engine.hae +++ b/code/src/system-state/system-state-engine.hae @@ -8,7 +8,7 @@ #include "src/common/triton-error.h" void triton_rpc_system_state_engine_register(void); -__blocking triton_ret_t remote_triton_rpc_system_state_put(na_addr_t addr, triton_node_t node, char* key, char* val); +__blocking triton_ret_t remote_triton_rpc_system_state_put(na_addr_t addr, triton_node_t node, const char* key, char* val); __blocking triton_ret_t system_state_engine_run(void); hooks/post-receive --

1 0

branch, master, updated. 46f94887960e347867b06f88f89362c4428eb627
by noreply＠mcs.anl.gov 12 Feb '14

12 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 46f94887960e347867b06f88f89362c4428eb627 (commit) from 1f8c395708af30d70602212e352dc400d27e5dbc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 46f94887960e347867b06f88f89362c4428eb627 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Feb 12 21:36:47 2014 -0500 switch to string encoder provided by mercury fixes #253 ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-encode.c | 66 ++------------------------ code/src/remote/mercury-encode.h | 3 - code/src/system-state/system-state-engine.ae | 3 +- code/src/system-state/system-state.ae | 3 +- code/tests/mercury/mercury-enc.ae | 3 +- 5 files changed, 11 insertions(+), 67 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-encode.c b/code/src/remote/mercury-encode.c index 87471ab..c21253a 100644 --- a/code/src/remote/mercury-encode.c +++ b/code/src/remote/mercury-encode.c @@ -1,5 +1,7 @@ #include <string.h> +#include <mercury_proc_string.h> + #include "src/remote/mercury-encode.h" #include "src/common/triton-error-internal.h" #include "src/common/node.h" @@ -63,7 +65,7 @@ int hg_proc_triton_ret_t(hg_proc_t proc, triton_ret_t *tret_p) */ if(!tret->predefined) { - ret = hg_proc_triton_charstar_t(proc, &tret->msg); + ret = hg_proc_hg_string_t(proc, &tret->msg); if (ret != HG_SUCCESS) { HG_ERROR_DEFAULT("Proc error"); ret = HG_FAIL; @@ -92,7 +94,7 @@ int hg_proc_triton_ret_t(hg_proc_t proc, triton_ret_t *tret_p) tret->error_code = tmp_error_code; tret->predefined = tmp_predefined; tret->base_msg = triton_errors[tmp_error_code]->base_msg; - ret = hg_proc_triton_charstar_t(proc, &tret->msg); + ret = hg_proc_hg_string_t(proc, &tret->msg); if (ret != HG_SUCCESS) { HG_ERROR_DEFAULT("Proc error"); ret = HG_FAIL; @@ -109,7 +111,7 @@ int hg_proc_triton_ret_t(hg_proc_t proc, triton_ret_t *tret_p) case HG_FREE: if(!tret->predefined) { - ret = hg_proc_triton_charstar_t(proc, &tret->msg); + ret = hg_proc_hg_string_t(proc, &tret->msg); if (ret != HG_SUCCESS) { HG_ERROR_DEFAULT("Proc error"); ret = HG_FAIL; @@ -129,64 +131,6 @@ int hg_proc_triton_ret_t(hg_proc_t proc, triton_ret_t *tret_p) return ret; } -int hg_proc_triton_charstar_t(hg_proc_t proc, triton_charstar_t *string) -{ - hg_uint64_t string_len = 0; - triton_charstar_t string_buf = NULL; - int ret = HG_FAIL; - - switch (hg_proc_get_op(proc)) { - case HG_ENCODE: - string_len = strlen(*string) + 1; - string_buf = *string; - ret = hg_proc_uint64_t(proc, &string_len); - if (ret != HG_SUCCESS) { - HG_ERROR_DEFAULT("Proc error"); - ret = HG_FAIL; - return ret; - } - ret = hg_proc_raw(proc, string_buf, string_len); - if (ret != HG_SUCCESS) { - HG_ERROR_DEFAULT("Proc error"); - ret = HG_FAIL; - return ret; - } - break; - case HG_DECODE: - ret = hg_proc_uint64_t(proc, &string_len); - if (ret != HG_SUCCESS) { - HG_ERROR_DEFAULT("Proc error"); - ret = HG_FAIL; - return ret; - } - string_buf = (triton_charstar_t) malloc(string_len); - ret = hg_proc_raw(proc, string_buf, string_len); - if (ret != HG_SUCCESS) { - HG_ERROR_DEFAULT("Proc error"); - ret = HG_FAIL; - return ret; - } - *string = string_buf; - break; - case HG_FREE: - string_buf = *string; - if (!string_buf) { - HG_ERROR_DEFAULT("Already freed"); - ret = HG_FAIL; - return ret; - } - free(string_buf); - *string = NULL; - ret = HG_SUCCESS; - break; - default: - break; - } - - return ret; -} - - /* * Local variables: * c-indent-level: 4 diff --git a/code/src/remote/mercury-encode.h b/code/src/remote/mercury-encode.h index cec4a42..0a41a03 100644 --- a/code/src/remote/mercury-encode.h +++ b/code/src/remote/mercury-encode.h @@ -16,9 +16,6 @@ int hg_proc_triton_node_t(hg_proc_t proc, triton_node_t *node_p); */ #define hg_proc_uint128_t hg_proc_triton_node_t -typedef char * triton_charstar_t; -int hg_proc_triton_charstar_t(hg_proc_t proc, triton_charstar_t *string); - #endif /* __MERCURY_ENCODE_H__ */ /* diff --git a/code/src/system-state/system-state-engine.ae b/code/src/system-state/system-state-engine.ae index 26469f3..09e112b 100644 --- a/code/src/system-state/system-state-engine.ae +++ b/code/src/system-state/system-state-engine.ae @@ -5,6 +5,7 @@ #include <triton-hash.h> #include <mercury_macros.h> #include <mercury_proc.h> +#include <mercury_proc_string.h> #include "src/system-state/system-state-engine.hae" #include "src/system-state/system-state.hae" @@ -18,7 +19,7 @@ /* generate input and output structs */ MERCURY_GEN_PROC(triton_rpc_system_state_put_out_t, ((triton_ret_t)(tret))) -MERCURY_GEN_PROC(triton_rpc_system_state_put_in_t, ((triton_node_t)(node))((triton_charstar_t)(key))((triton_charstar_t)(val))) +MERCURY_GEN_PROC(triton_rpc_system_state_put_in_t, ((triton_node_t)(node))((hg_const_string_t)(key))((hg_string_t)(val))) static hg_id_t g_rpc_put_id; static int triton_rpc_system_state_put_handler(hg_handle_t handle); diff --git a/code/src/system-state/system-state.ae b/code/src/system-state/system-state.ae index de685d0..f5249d1 100644 --- a/code/src/system-state/system-state.ae +++ b/code/src/system-state/system-state.ae @@ -3,6 +3,7 @@ #include <triton-hash.h> #include <mercury_macros.h> #include <mercury_proc.h> +#include <mercury_proc_string.h> #include "src/system-state/system-state.hae" #include "src/common/triton-debug.h" @@ -27,7 +28,7 @@ struct state_entry }; /* generate input and output structs */ -MERCURY_GEN_PROC(triton_rpc_system_state_get_snapshot_out_t, ((triton_ret_t)(tret))((triton_charstar_t)(serialized))) +MERCURY_GEN_PROC(triton_rpc_system_state_get_snapshot_out_t, ((triton_ret_t)(tret))((hg_string_t)(serialized))) static hg_id_t g_rpc_get_snapshot_id; static int triton_rpc_system_state_get_snapshot_handler(hg_handle_t handle); diff --git a/code/tests/mercury/mercury-enc.ae b/code/tests/mercury/mercury-enc.ae index c74f842..2eb85aa 100644 --- a/code/tests/mercury/mercury-enc.ae +++ b/code/tests/mercury/mercury-enc.ae @@ -11,6 +11,7 @@ #include <triton-thread.h> #include <mercury_macros.h> #include <mercury_proc.h> +#include <mercury_proc_string.h> #include "src/common/triton-error.h" #include "tests/mercury/mercury-enc.hae" #include "src/remote/mercury-engine.hae" @@ -124,7 +125,7 @@ hg_proc_array_struct(hg_proc_t proc, void *data) #endif /* generate encoding for input struct */ -MERCURY_GEN_STRUCT_PROC(nester_struct, ((int32_t)(x))((triton_charstar_t)(msg))) +MERCURY_GEN_STRUCT_PROC(nester_struct, ((int32_t)(x))((hg_string_t)(msg))) MERCURY_GEN_STRUCT_PROC(req_struct, ((int32_t)(x))((nester_struct)(nest))((array_struct)(array))) /* generate output struct */ hooks/post-receive --

1 0

branch, master, updated. 1f8c395708af30d70602212e352dc400d27e5dbc
by noreply＠mcs.anl.gov 12 Feb '14

12 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 1f8c395708af30d70602212e352dc400d27e5dbc (commit) from 0f322c200356134a2a3474259b107483b4f8fdab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1f8c395708af30d70602212e352dc400d27e5dbc Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Feb 12 21:12:00 2014 -0500 fix warnings on mercury encoder prototypes ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/rosd-range.ae | 5 +++-- code/src/replicated-osd/rosd-read.ae | 5 +++-- code/src/replicated-osd/rosd-write.ae | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/rosd-range.ae b/code/src/replicated-osd/rosd-range.ae index 9b30bd4..d627805 100644 --- a/code/src/replicated-osd/rosd-range.ae +++ b/code/src/replicated-osd/rosd-range.ae @@ -31,7 +31,7 @@ typedef struct uint128_t* oid_array; uint32_t oid_array_count; } triton_rpc_rosd_range_out_t; -static int hg_proc_triton_rpc_rosd_range_out_t(hg_proc_t proc, triton_rpc_rosd_range_out_t* out_p); +static int hg_proc_triton_rpc_rosd_range_out_t(hg_proc_t proc, void* v_out_p); static hg_id_t rpc_rosd_range_id; static int triton_rpc_rosd_range_handler(hg_handle_t handle); @@ -144,8 +144,9 @@ void triton_rpc_rosd_range_register(void) } /* TODO: refactor this */ -static int hg_proc_triton_rpc_rosd_range_out_t(hg_proc_t proc, triton_rpc_rosd_range_out_t* out_p) +static int hg_proc_triton_rpc_rosd_range_out_t(hg_proc_t proc, void* v_out_p) { + triton_rpc_rosd_range_out_t* out_p = v_out_p; int ret = HG_FAIL; int i; diff --git a/code/src/replicated-osd/rosd-read.ae b/code/src/replicated-osd/rosd-read.ae index 73eed23..9f0b50e 100644 --- a/code/src/replicated-osd/rosd-read.ae +++ b/code/src/replicated-osd/rosd-read.ae @@ -34,7 +34,7 @@ typedef struct uint32_t eager_payload_size; uint64_t txn_number; } triton_rpc_rosd_read_out_t; -static int hg_proc_triton_rpc_rosd_read_out_t(hg_proc_t proc, triton_rpc_rosd_read_out_t* out_p); +static int hg_proc_triton_rpc_rosd_read_out_t(hg_proc_t proc, void *v_out_p); static hg_id_t rpc_rosd_read_id; static __blocking triton_ret_t triton_rpc_rosd_read(hg_handle_t handle); @@ -189,9 +189,10 @@ void triton_rpc_rosd_read_register(void) /* TODO: refactor this somehow; a big chunk of this function is * duplicated... */ -static int hg_proc_triton_rpc_rosd_read_out_t(hg_proc_t proc, triton_rpc_rosd_read_out_t* out_p) +static int hg_proc_triton_rpc_rosd_read_out_t(hg_proc_t proc, void* v_out_p) { int ret = HG_FAIL; + triton_rpc_rosd_read_out_t* out_p = v_out_p; switch (hg_proc_get_op(proc)) { case HG_ENCODE: diff --git a/code/src/replicated-osd/rosd-write.ae b/code/src/replicated-osd/rosd-write.ae index aba4f61..c9fba6f 100644 --- a/code/src/replicated-osd/rosd-write.ae +++ b/code/src/replicated-osd/rosd-write.ae @@ -35,7 +35,7 @@ typedef struct char* eager_payload; uint32_t eager_payload_size; } triton_rpc_rosd_write_in_t; -static int hg_proc_triton_rpc_rosd_write_in_t(hg_proc_t proc, triton_rpc_rosd_write_in_t* out_p); +static int hg_proc_triton_rpc_rosd_write_in_t(hg_proc_t proc, void *v_out_p); static hg_id_t rpc_rosd_write_id; @@ -321,9 +321,10 @@ static __blocking triton_ret_t __remote_triton_rpc_rosd_write( /* TODO: refactor this somehow; a big chunk of this function is * duplicated... */ -static int hg_proc_triton_rpc_rosd_write_in_t(hg_proc_t proc, triton_rpc_rosd_write_in_t* in_p) +static int hg_proc_triton_rpc_rosd_write_in_t(hg_proc_t proc, void* v_in_p) { int ret = HG_FAIL; + triton_rpc_rosd_write_in_t* in_p = v_in_p; switch (hg_proc_get_op(proc)) { case HG_ENCODE: hooks/post-receive --

1 0

branch, master, updated. 0f322c200356134a2a3474259b107483b4f8fdab
by noreply＠mcs.anl.gov 12 Feb '14

12 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 0f322c200356134a2a3474259b107483b4f8fdab (commit) from 1fdcd40fefe6a32a160e1b0c64b420f97fbb4eb3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f322c200356134a2a3474259b107483b4f8fdab Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Feb 12 21:01:12 2014 -0500 fix misc. warnings ----------------------------------------------------------------------- Summary of changes: code/src/admin-tools/triton-show-system-state.ae | 12 +++++++++--- code/src/remote/mercury-engine.hae | 2 +- code/src/replicated-osd/rosd.ae | 1 + code/src/system-state/system-state.ae | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/admin-tools/triton-show-system-state.ae b/code/src/admin-tools/triton-show-system-state.ae index ab5f4f9..5dcf513 100644 --- a/code/src/admin-tools/triton-show-system-state.ae +++ b/code/src/admin-tools/triton-show-system-state.ae @@ -17,21 +17,27 @@ static void make_state_pretty(char* serialized_state) char* ind; ind = serialized_state; - while((ind = index(ind, ','))) + ind = index(ind, ','); + while(ind) { ind[0] = '\n'; + ind = index(ind, ','); } ind = serialized_state; - while((ind = index(ind, '<'))) + ind = index(ind, '<'); + while(ind) { ind[0] = ' '; + ind = index(ind, '<'); } ind = serialized_state; - while((ind = index(ind, '>'))) + ind = index(ind, '>'); + while(ind) { ind[0] = ' '; + ind = index(ind, '>'); } return; diff --git a/code/src/remote/mercury-engine.hae b/code/src/remote/mercury-engine.hae index be9f711..9fafd63 100644 --- a/code/src/remote/mercury-engine.hae +++ b/code/src/remote/mercury-engine.hae @@ -40,7 +40,7 @@ static int __name##_handler(hg_handle_t handle) { \ #define triton_mercury_get_input(__handle, __in, __out) \ do { \ int __ret; \ - memset(__out, 0, sizeof(__out)); \ + memset(__out, 0, sizeof(*(__out))); \ __ret = HG_Handler_get_input(__handle, __in); \ if(__ret != HG_SUCCESS) { \ triton_error_msg("HG_handler_get_input() failure, return code %d.\n", __ret); \ diff --git a/code/src/replicated-osd/rosd.ae b/code/src/replicated-osd/rosd.ae index fa72023..708c968 100644 --- a/code/src/replicated-osd/rosd.ae +++ b/code/src/replicated-osd/rosd.ae @@ -7,6 +7,7 @@ #include "src/replicated-osd/rosd.hae" #include "src/replicated-osd/rosd-internal.hae" +#include "src/replicated-osd/rosd-txn-nr-cache.hae" #include "src/common/triton-debug.h" #include "src/common/self.h" #include "src/placement/placement.h" diff --git a/code/src/system-state/system-state.ae b/code/src/system-state/system-state.ae index 9929fd3..de685d0 100644 --- a/code/src/system-state/system-state.ae +++ b/code/src/system-state/system-state.ae @@ -247,7 +247,8 @@ triton_ret_t system_state_serialized_load(const char* ser) triton_mutex_lock(&state_mutex); - while((token = strtok(toker, ","))) + token = strtok(toker, ","); + while(token) { toker = NULL; @@ -270,6 +271,7 @@ triton_ret_t system_state_serialized_load(const char* ser) free(free_me); return(tret); } + token = strtok(toker, ","); } free(free_me); hooks/post-receive --

1 0

C-Utils Repository branch, master, updated. a287b3d9e90b703ff61c62feaad0f92d64eaa1b6
by noreply＠mcs.anl.gov 12 Feb '14

12 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "C-Utils Repository". The branch, master has been updated via a287b3d9e90b703ff61c62feaad0f92d64eaa1b6 (commit) from 8acceabb88d7ba12c4d34099cfd23b19ee73c180 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a287b3d9e90b703ff61c62feaad0f92d64eaa1b6 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Feb 12 20:41:33 2014 -0500 fix warning ----------------------------------------------------------------------- Summary of changes: src/triton-hash.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Diff of changes: diff --git a/src/triton-hash.h b/src/triton-hash.h index 0665906..e1872ff 100644 --- a/src/triton-hash.h +++ b/src/triton-hash.h @@ -11,6 +11,7 @@ #include "triton-list.h" #include "jenkins-hash.h" +#include <stdlib.h> #include <string.h> #include <errno.h> hooks/post-receive -- C-Utils Repository

1 0

branch, master, updated. 1fdcd40fefe6a32a160e1b0c64b420f97fbb4eb3
by noreply＠mcs.anl.gov 12 Feb '14

12 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 1fdcd40fefe6a32a160e1b0c64b420f97fbb4eb3 (commit) from 4f8aa129dc55647e112f6eb49237fa525134c556 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1fdcd40fefe6a32a160e1b0c64b420f97fbb4eb3 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Feb 12 16:04:55 2014 -0500 hack to prevent occasional mercury test assert Without this I occasionally see assertions out of the Aesop semaphore resource at shutdown time (because the cancel queue is not yet empty). I'm not precisely sure why this happens, but I don't want to spend much time debugging a unit test. It goes away if I insert a timer call to make sure aesop has a chance to context switch and complete the cancel callback. ----------------------------------------------------------------------- Summary of changes: code/tests/mercury/mercury-enc-svr.ae | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/tests/mercury/mercury-enc-svr.ae b/code/tests/mercury/mercury-enc-svr.ae index 9a4bdcb..9a30c52 100644 --- a/code/tests/mercury/mercury-enc-svr.ae +++ b/code/tests/mercury/mercury-enc-svr.ae @@ -5,6 +5,7 @@ #include <signal.h> #include <aesop/aesop.h> +#include <aesop/timer.hae> #include "src/zeroconf/zeroconf.h" #include "src/remote/mercury-engine.hae" #include "src/common/resources/signal/signal.hae" @@ -69,6 +70,11 @@ __blocking int aesop_main(int argc, char **argv) } } + /* NOTE: this is a hack; there is some timing issue with shutdown in + * this example. + */ + aesop_timer(1); + printf("Server shutting down cleanly.\n"); fflush(NULL); hooks/post-receive --

1 0

branch, master, updated. 4f8aa129dc55647e112f6eb49237fa525134c556
by noreply＠mcs.anl.gov 12 Feb '14

12 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 4f8aa129dc55647e112f6eb49237fa525134c556 (commit) from b38da2b216998735b82ba2accf40d9c1379438e0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4f8aa129dc55647e112f6eb49237fa525134c556 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Feb 12 10:43:47 2014 -0500 update admin-tool usage for ipv6 notation ----------------------------------------------------------------------- Summary of changes: code/src/admin-tools/triton-cp.ae | 2 +- code/src/admin-tools/triton-rm.ae | 2 +- code/src/admin-tools/triton-touch.ae | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/admin-tools/triton-cp.ae b/code/src/admin-tools/triton-cp.ae index 903aebc..4f8979d 100644 --- a/code/src/admin-tools/triton-cp.ae +++ b/code/src/admin-tools/triton-cp.ae @@ -65,7 +65,7 @@ __blocking int aesop_main(int argc, char **argv) { fprintf(stderr, "Usage: %s <server> <src> <dest> <replication_factor>\n", argv[0]); fprintf(stderr, " (prefix local files with \"posix:\")\n"); - fprintf(stderr, " Example: triton-cp tcp://localhost:3344 posix:/tmp/a.dat 123.123\n"); + fprintf(stderr, " Example: triton-cp tcp://localhost:3344 posix:/tmp/a.dat ::123\n"); fprintf(stderr, " The <replication_factor> argument is optional.\n"); return(-1); } diff --git a/code/src/admin-tools/triton-rm.ae b/code/src/admin-tools/triton-rm.ae index 2883eb9..4556c94 100644 --- a/code/src/admin-tools/triton-rm.ae +++ b/code/src/admin-tools/triton-rm.ae @@ -33,7 +33,7 @@ void usage (char *progname) "usage: %s [--help] --server <server> <oid> [<oid> .. <oid>]\n" " --server <server> : initial server to contact\n" " --help : usage message\n" - "example: %s --server tcp://localhost:3334 10.1234 10.1235\n", + "example: %s --server tcp://localhost:3334 ::1234 ::1235\n", progname, progname); exit(1); return; diff --git a/code/src/admin-tools/triton-touch.ae b/code/src/admin-tools/triton-touch.ae index c1825b1..4dac869 100644 --- a/code/src/admin-tools/triton-touch.ae +++ b/code/src/admin-tools/triton-touch.ae @@ -24,7 +24,7 @@ __blocking int aesop_main(int argc, char **argv) if(argc != 4) { fprintf(stderr, "Usage: %s <server> <oid> <replication_factor>\n", argv[0]); - fprintf(stderr, " Example: triton-touch tcp://localhost:3344 123.123 3\n"); + fprintf(stderr, " Example: triton-touch tcp://localhost:3344 ::123 3\n"); return(-1); } hooks/post-receive --

1 0